From: zottel <github@zottel.net>
Date: Fri, 4 May 2012 22:54:00 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3cd428152d8727b838565c462f91accd35204ce1;p=friendica.git

Merge remote branch 'upstream/master'
---

3cd428152d8727b838565c462f91accd35204ce1