From: zottel <github@zottel.net>
Date: Mon, 7 May 2012 07:11:45 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a2ea560bf397902ce5608daabf101d0bcf813f13;p=friendica.git

Merge remote branch 'upstream/master'
---

a2ea560bf397902ce5608daabf101d0bcf813f13