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

Merge remote branch 'upstream/master'
---

c43a03e21bcd12b24be8a59741ec6591c1f651d7