Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 7 Mar 2016 15:48:28 +0000 (16:48 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 7 Mar 2016 15:48:28 +0000 (16:48 +0100)
commitc57cfcae84697d51a3e0ba2047a3c087adc3b8aa
tree5cc07fa771036b21e63efc09eb52633ef3da51bc
parent7773a9f6f197af9ed28385ac44c16c4a44e3ad60
parent17908511c23d6f94db1364e803bdc6cdfdc085d6
Merge 0.10->trunk
prosodyctl