From: zottel <github@zottel.net>
Date: Tue, 27 Mar 2012 11:20:59 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fb817a29a934a68f194a42c29d3ed11da2da558f;p=friendica.git

Merge remote branch 'upstream/master'
---

fb817a29a934a68f194a42c29d3ed11da2da558f