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

author Michael Vogel <icarus@dabo.de>

Mon, 1 Aug 2016 06:02:26 +0000 (08:02 +0200)

committer Michael Vogel <icarus@dabo.de>

Mon, 1 Aug 2016 06:02:26 +0000 (08:02 +0200)
author Michael Vogel <icarus@dabo.de>
Mon, 1 Aug 2016 06:02:26 +0000 (08:02 +0200)
committer Michael Vogel <icarus@dabo.de>
Mon, 1 Aug 2016 06:02:26 +0000 (08:02 +0200)
diff --cc boot.php
Simple merge
diff --cc include/Contact.php
Simple merge
diff --cc update.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Mon, 1 Aug 2016 06:02:26 +0000 (08:02 +0200)
committer	Michael Vogel <icarus@dabo.de>
	Mon, 1 Aug 2016 06:02:26 +0000 (08:02 +0200)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/Contact.php	patch \|	diff1 \|	diff2 \|	blob \| history
update.php	patch \|	diff1 \|	diff2 \|	blob \| history