From: Michael <icarus@dabo.de>
Date: Fri, 2 Mar 2012 09:34:18 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=20817b4b8ea8b7d074d57a3fd752862931cf711c;p=friendica.git

Merge remote branch 'upstream/master'
---

20817b4b8ea8b7d074d57a3fd752862931cf711c