From: zottel <github@zottel.net>
Date: Sun, 4 Nov 2012 10:05:40 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6aca58f32052a8c4a78f471db3247c34f4931c7b;p=friendica.git

Merge remote branch 'upstream/master'
---

6aca58f32052a8c4a78f471db3247c34f4931c7b