From: Michael <icarus@dabo.de>
Date: Mon, 27 Feb 2012 15:31:58 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cce69f05097f559593c06e8595e1da5b904e5323;p=friendica.git

Merge remote branch 'upstream/master'
---

cce69f05097f559593c06e8595e1da5b904e5323