From: Michael Vogel <icarus@dabo.de>
Date: Wed, 28 Mar 2012 17:52:30 +0000 (+0200)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bdd275474044152a5d9a33ea6b8a8071b931d27e;p=friendica.git

Merge commit 'upstream/master'
---

bdd275474044152a5d9a33ea6b8a8071b931d27e