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

author Michael Vogel <icarus@dabo.de>

Sun, 4 Jan 2015 19:21:49 +0000 (20:21 +0100)

committer Michael Vogel <icarus@dabo.de>

Sun, 4 Jan 2015 19:21:49 +0000 (20:21 +0100)
author Michael Vogel <icarus@dabo.de>
Sun, 4 Jan 2015 19:21:49 +0000 (20:21 +0100)
committer Michael Vogel <icarus@dabo.de>
Sun, 4 Jan 2015 19:21:49 +0000 (20:21 +0100)
diff --cc boot.php
Simple merge
diff --cc include/dbstructure.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Sun, 4 Jan 2015 19:21:49 +0000 (20:21 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Sun, 4 Jan 2015 19:21:49 +0000 (20:21 +0100)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/dbstructure.php	patch \|	diff1 \|	diff2 \|	blob \| history