From: zottel <github@zottel.net>
Date: Thu, 3 May 2012 08:21:38 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=35771a778df18afb231969c242680a6353e5ef8e;p=friendica.git

Merge remote branch 'upstream/master'
---

35771a778df18afb231969c242680a6353e5ef8e