Merge 0.8->trunk

author Matthew Wild <mwild1@gmail.com>

Tue, 7 Jun 2011 00:29:34 +0000 (01:29 +0100)

committer Matthew Wild <mwild1@gmail.com>

Tue, 7 Jun 2011 00:29:34 +0000 (01:29 +0100)
author Matthew Wild <mwild1@gmail.com>
Tue, 7 Jun 2011 00:29:34 +0000 (01:29 +0100)
committer Matthew Wild <mwild1@gmail.com>
Tue, 7 Jun 2011 00:29:34 +0000 (01:29 +0100)
diff --cc plugins/mod_bosh.lua
Simple merge
diff --cc plugins/mod_dialback.lua
Simple merge
author	Matthew Wild <mwild1@gmail.com>
	Tue, 7 Jun 2011 00:29:34 +0000 (01:29 +0100)
committer	Matthew Wild <mwild1@gmail.com>
	Tue, 7 Jun 2011 00:29:34 +0000 (01:29 +0100)
		1	2
plugins/mod_bosh.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_dialback.lua	patch \|	diff1 \|	diff2 \|	blob \| history