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

Merge remote branch 'upstream/master'
---

f39e8126773e2a030cf84c8b9d428cc78546c1b9