From: Michael Vogel <icarus@dabo.de>
Date: Thu, 20 Sep 2012 06:32:33 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c389eb73b11067f0fd4e06de47400e5894034b4;p=friendica.git

Merge remote branch 'upstream/master'
---

4c389eb73b11067f0fd4e06de47400e5894034b4