From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 6 Mar 2012 23:42:00 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=668892b7a38547210b8162f9988844c99474b051;p=friendica.git

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

* remotes/upstream/master:

* master:
---