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

Merge remote branch 'upstream/master'
---

68757f25042b02624bfb748c25029023b3082f62