From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 16 May 2012 09:29:34 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2d6c6255f9a9c2f21c1e48105ce36b0f8c3418cc;p=friendica.git

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

* remotes/upstream/master:

* master:
---