From: zottel <github@zottel.net>
Date: Tue, 8 May 2012 07:05:38 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=78429926bcf1ab7e8a4d35d0093ba666b3568708;p=friendica.git

Merge remote branch 'upstream/master'
---

78429926bcf1ab7e8a4d35d0093ba666b3568708