Merge remote branch 'upstream/master'

author Tobias Hößl <tobias@hoessl.eu>

Tue, 28 Feb 2012 21:19:02 +0000 (21:19 +0000)

committer Tobias Hößl <tobias@hoessl.eu>

Tue, 28 Feb 2012 21:19:02 +0000 (21:19 +0000)
author Tobias Hößl <tobias@hoessl.eu>
Tue, 28 Feb 2012 21:19:02 +0000 (21:19 +0000)
committer Tobias Hößl <tobias@hoessl.eu>
Tue, 28 Feb 2012 21:19:02 +0000 (21:19 +0000)
diff --cc boot.php
Simple merge
diff --cc include/conversation.php
Simple merge
author	Tobias Hößl <tobias@hoessl.eu>
	Tue, 28 Feb 2012 21:19:02 +0000 (21:19 +0000)
committer	Tobias Hößl <tobias@hoessl.eu>
	Tue, 28 Feb 2012 21:19:02 +0000 (21:19 +0000)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history