Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup

author Michael Vogel <icarus@dabo.de>

Sat, 13 Feb 2016 19:12:31 +0000 (20:12 +0100)

committer Michael Vogel <icarus@dabo.de>

Sat, 13 Feb 2016 19:12:31 +0000 (20:12 +0100)
author Michael Vogel <icarus@dabo.de>
Sat, 13 Feb 2016 19:12:31 +0000 (20:12 +0100)
committer Michael Vogel <icarus@dabo.de>
Sat, 13 Feb 2016 19:12:31 +0000 (20:12 +0100)
diff --cc boot.php
Simple merge
diff --cc include/dfrn.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Sat, 13 Feb 2016 19:12:31 +0000 (20:12 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Sat, 13 Feb 2016 19:12:31 +0000 (20:12 +0100)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/dfrn.php	patch \|	diff1 \|	diff2 \|	blob \| history