From: zottel <github@zottel.net>
Date: Sat, 28 Apr 2012 00:30:20 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720;p=friendica.git

Merge remote branch 'upstream/master'
---

43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720