From: zottel <github@zottel.net>
Date: Tue, 24 Apr 2012 08:38:23 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=912e008ded3d439f7779310eb422e4b871a9b63d;p=friendica.git

Merge remote branch 'upstream/master'
---

912e008ded3d439f7779310eb422e4b871a9b63d