From: Michael Vogel <icarus@dabo.de>
Date: Mon, 2 Apr 2012 20:00:22 +0000 (+0200)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3dc317dcc62c8e982d964bcae421a1410771d51c;p=friendica.git

Merge commit 'upstream/master'
---

3dc317dcc62c8e982d964bcae421a1410771d51c