From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 11 Mar 2012 21:05:08 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6e5f8376090be020b81f8793a2bed65ba9a879a5;p=friendica.git

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

* remotes/upstream/master:

* master:
---