Merge remote-tracking branch 'upstream/master'

author Michael Vogel <icarus@dabo.de>

Mon, 17 Dec 2012 09:32:53 +0000 (10:32 +0100)

committer Michael Vogel <icarus@dabo.de>

Mon, 17 Dec 2012 09:32:53 +0000 (10:32 +0100)
author Michael Vogel <icarus@dabo.de>
Mon, 17 Dec 2012 09:32:53 +0000 (10:32 +0100)
committer Michael Vogel <icarus@dabo.de>
Mon, 17 Dec 2012 09:32:53 +0000 (10:32 +0100)
diff --cc boot.php
Simple merge
diff --cc include/onepoll.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Mon, 17 Dec 2012 09:32:53 +0000 (10:32 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Mon, 17 Dec 2012 09:32:53 +0000 (10:32 +0100)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/onepoll.php	patch \|	diff1 \|	diff2 \|	blob \| history