Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage

author Michael Vogel <icarus@dabo.de>

Sun, 1 Feb 2015 12:28:32 +0000 (13:28 +0100)

committer Michael Vogel <icarus@dabo.de>

Sun, 1 Feb 2015 12:28:32 +0000 (13:28 +0100)
author Michael Vogel <icarus@dabo.de>
Sun, 1 Feb 2015 12:28:32 +0000 (13:28 +0100)
committer Michael Vogel <icarus@dabo.de>
Sun, 1 Feb 2015 12:28:32 +0000 (13:28 +0100)
diff --cc boot.php
Simple merge
diff --cc mod/display.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Sun, 1 Feb 2015 12:28:32 +0000 (13:28 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Sun, 1 Feb 2015 12:28:32 +0000 (13:28 +0100)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/display.php	patch \|	diff1 \|	diff2 \|	blob \| history