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

Merge commit 'upstream/master'
---

7d23149a61f75923b2c71a288a722ee219f5e6ba