Merge 0.9->0.10

author Waqas Hussain <waqas20@gmail.com>

Wed, 8 Oct 2014 22:42:33 +0000 (18:42 -0400)

committer Waqas Hussain <waqas20@gmail.com>

Wed, 8 Oct 2014 22:42:33 +0000 (18:42 -0400)
author Waqas Hussain <waqas20@gmail.com>
Wed, 8 Oct 2014 22:42:33 +0000 (18:42 -0400)
committer Waqas Hussain <waqas20@gmail.com>
Wed, 8 Oct 2014 22:42:33 +0000 (18:42 -0400)
diff --cc util/dataforms.lua
Simple merge
diff --cc util/stanza.lua
Simple merge
author	Waqas Hussain <waqas20@gmail.com>
	Wed, 8 Oct 2014 22:42:33 +0000 (18:42 -0400)
committer	Waqas Hussain <waqas20@gmail.com>
	Wed, 8 Oct 2014 22:42:33 +0000 (18:42 -0400)
		1	2
util/dataforms.lua	patch \|	diff1 \|	diff2 \|	blob \| history
util/stanza.lua	patch \|	diff1 \|	diff2 \|	blob \| history