From: zottel <github@zottel.net>
Date: Wed, 30 May 2012 09:08:02 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=24b58af68938558baa2ddc6809401ec528ff1176;p=friendica.git

Merge remote branch 'upstream/master'
---

24b58af68938558baa2ddc6809401ec528ff1176