From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 12 May 2012 22:56:13 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f267a283b46edaf389e99ef3ea4341a5a0496aab;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:
---