From: Michael <icarus@dabo.de>
Date: Sat, 26 May 2012 09:59:19 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7b3c02057db47a627b56bdd79f1055ea7f876617;p=friendica.git

Merge remote branch 'upstream/master'
---

7b3c02057db47a627b56bdd79f1055ea7f876617