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

Merge remote branch 'upstream/master'
---

dedaa301cba5ca6c21af9ec54cc54a7f7480e2f4