From: Michael <icarus@dabo.de>
Date: Thu, 12 Apr 2012 22:10:13 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7384786d4417ddd051b7daa71c019d3c551efc68;p=friendica.git

Merge remote branch 'upstream/master'
---

7384786d4417ddd051b7daa71c019d3c551efc68