From: Michael Vogel <icarus@dabo.de>
Date: Mon, 10 Sep 2012 21:28:07 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5cfb068c251b4c69466e4e7550c0076c92284488;p=friendica.git

Merge remote branch 'upstream/master'
---

5cfb068c251b4c69466e4e7550c0076c92284488