From: Michael Vogel <icarus@dabo.de>
Date: Sun, 8 Apr 2012 08:07:39 +0000 (+0200)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ce0eac44b5035b8f46259b6665826a94b633ec4e;p=friendica.git

Merge commit 'upstream/master'
---

ce0eac44b5035b8f46259b6665826a94b633ec4e