From: zottel <github@zottel.net>
Date: Sat, 17 Mar 2012 00:49:17 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c56e3c5dd4bcbb949282fd3b4c065ccfd4673726;p=friendica.git

Merge remote branch 'upstream/master'
---

c56e3c5dd4bcbb949282fd3b4c065ccfd4673726