From: Michael Vogel <icarus@dabo.de>
Date: Tue, 7 Jun 2016 20:40:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1606-shared-template
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f59b21d4a8010847f05cc1ca0ded1b6940e26429;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1606-shared-template
---

f59b21d4a8010847f05cc1ca0ded1b6940e26429