From: zottel <github@zottel.net>
Date: Sun, 15 Apr 2012 12:11:11 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a2c4ce74871dbe9e640cdeafc1574bda5b7fe144;p=friendica.git

Merge remote branch 'upstream/master'
---

a2c4ce74871dbe9e640cdeafc1574bda5b7fe144