From: zottel <github@zottel.net>
Date: Thu, 10 May 2012 07:58:52 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4709960189e48fa1e073035cde916767f3dd830e;p=friendica.git

Merge remote branch 'upstream/master'
---

4709960189e48fa1e073035cde916767f3dd830e