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

Merge remote branch 'upstream/master'
---

2a83ebf77f87037c437f957a471764ad0c817235