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

Merge remote branch 'upstream/master'
---

70c4ab68754941749a5e89434d6db19f6bba1e16