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

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

* remotes/upstream/master:

* master:
---