From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 27 Apr 2012 18:33:11 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fcbe78f9aa5885f858abebad076a0ff8c8ba15ae;p=friendica.git

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

* remotes/upstream/master:

* master:
---