From: Michael <icarus@dabo.de>
Date: Wed, 11 Apr 2012 16:48:58 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=39405c8056b4a1d55c97fb2963d8776695dbeb30;p=friendica.git

Merge remote branch 'upstream/master'
---

39405c8056b4a1d55c97fb2963d8776695dbeb30