Merge 0.10->trunk

author Kim Alvefur <zash@zash.se>

Wed, 13 Jul 2016 08:25:52 +0000 (10:25 +0200)

committer Kim Alvefur <zash@zash.se>

Wed, 13 Jul 2016 08:25:52 +0000 (10:25 +0200)
author Kim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 08:25:52 +0000 (10:25 +0200)
committer Kim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 08:25:52 +0000 (10:25 +0200)
diff --cc prosodyctl
Simple merge
diff --cc tests/test.lua
Simple merge
author	Kim Alvefur <zash@zash.se>
	Wed, 13 Jul 2016 08:25:52 +0000 (10:25 +0200)
committer	Kim Alvefur <zash@zash.se>
	Wed, 13 Jul 2016 08:25:52 +0000 (10:25 +0200)
		1	2
prosodyctl	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test.lua	patch \|	diff1 \|	diff2 \|	blob \| history