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

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

* remotes/upstream/master:

* master:
---