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

Merge commit 'upstream/master'
---

ee714daf4d33f8258e1301438423fc10a3bdc916