From: zottel <github@zottel.net>
Date: Thu, 22 Mar 2012 15:03:14 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e7d80a79fff23e6f8900b40677d11d1022a45df6;p=friendica.git

Merge remote branch 'upstream/master'
---

e7d80a79fff23e6f8900b40677d11d1022a45df6