From: Michael Vogel <icarus@dabo.de>
Date: Fri, 9 Mar 2012 10:41:23 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=11c29e0cba4f521c5f37d963109c4807af8bccae;p=friendica.git

Merge commit 'upstream/master'
---

11c29e0cba4f521c5f37d963109c4807af8bccae