From: Michael Vogel <icarus@dabo.de>
Date: Thu, 21 Jul 2016 20:48:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2e9d233367068fceac8005126d14a2002539c772;p=friendica.git

Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	boot.php
---

2e9d233367068fceac8005126d14a2002539c772