Merge branch 'master' into develop

author Tobias Diekershoff <tobias.diekershoff@gmx.net>

Tue, 6 Jun 2017 10:20:55 +0000 (12:20 +0200)

committer Tobias Diekershoff <tobias.diekershoff@gmx.net>

Tue, 6 Jun 2017 10:20:55 +0000 (12:20 +0200)
author Tobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 6 Jun 2017 10:20:55 +0000 (12:20 +0200)
committer Tobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 6 Jun 2017 10:20:55 +0000 (12:20 +0200)
diff --cc include/dbstructure.php
Simple merge
diff --cc include/diaspora.php
Simple merge
diff --cc include/poller.php
Simple merge
author	Tobias Diekershoff <tobias.diekershoff@gmx.net>
	Tue, 6 Jun 2017 10:20:55 +0000 (12:20 +0200)
committer	Tobias Diekershoff <tobias.diekershoff@gmx.net>
	Tue, 6 Jun 2017 10:20:55 +0000 (12:20 +0200)
		1	2
include/dbstructure.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/diaspora.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/poller.php	patch \|	diff1 \|	diff2 \|	blob \| history