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

author Michael Vogel <icarus@dabo.de>

Mon, 25 Jan 2016 22:51:11 +0000 (23:51 +0100)

committer Michael Vogel <icarus@dabo.de>

Mon, 25 Jan 2016 22:51:11 +0000 (23:51 +0100)
author Michael Vogel <icarus@dabo.de>
Mon, 25 Jan 2016 22:51:11 +0000 (23:51 +0100)
committer Michael Vogel <icarus@dabo.de>
Mon, 25 Jan 2016 22:51:11 +0000 (23:51 +0100)
diff --cc include/Contact.php
Simple merge
diff --cc include/cron.php
Simple merge
diff --cc include/onepoll.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Mon, 25 Jan 2016 22:51:11 +0000 (23:51 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Mon, 25 Jan 2016 22:51:11 +0000 (23:51 +0100)
		1	2
include/Contact.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/cron.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/onepoll.php	patch \|	diff1 \|	diff2 \|	blob \| history