From: Michael Vogel <icarus@dabo.de>
Date: Sun, 4 Jan 2015 18:32:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7084adfd1cd0e36394f09c7925f4dbd1922926ee;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco

Conflicts:
	boot.php
	update.php
---

7084adfd1cd0e36394f09c7925f4dbd1922926ee