Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Tue, 22 Apr 2014 22:22:36 +0000 (00:22 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 22 Apr 2014 22:22:36 +0000 (00:22 +0200)
commit2812d8d444f3408276eba8108b2535a5446e82b3
tree5027badf1de556049e3d867a4d91a143d32002e0
parent6e893e50b4316aec8239dd7db609f0d73c88c70a
parentd8f3c45f4c6ac0257225fa750e40933d9c491c7e
Merge 0.9->0.10
tools/jabberd14sql2prosody.lua
util/dataforms.lua