From: Michael <icarus@dabo.de>
Date: Sat, 14 Apr 2012 11:03:40 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=188829ed46be6d3c7a91380226e26e8292c327be;p=friendica.git

Merge remote branch 'upstream/master'
---

188829ed46be6d3c7a91380226e26e8292c327be