From: zottel <github@zottel.net>
Date: Wed, 6 Jun 2012 23:07:33 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3b5b216cad47a8c7094cb5f3b345c6d76fa85f57;p=friendica.git

Merge remote branch 'upstream/master'
---

3b5b216cad47a8c7094cb5f3b345c6d76fa85f57