From: Michael Vogel <icarus@dabo.de>
Date: Fri, 19 Oct 2012 05:12:15 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=28b085569abe388473399555d9e3d5b9c7ce5580;p=friendica.git

Merge remote branch 'upstream/master'
---

28b085569abe388473399555d9e3d5b9c7ce5580