Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Fri, 25 Sep 2015 16:11:24 +0000 (18:11 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 25 Sep 2015 16:11:24 +0000 (18:11 +0200)
commitfb932a967b093e5a7dd9c21b7fa058729890e542
tree8f307fb594cb7f38d3fe25fe732f33397c6b32b7
parent764c3d074496b49e940fc312c7ab34bc68186717
parent53a00f38d046c5ee6330d528d881061d18884b79
Merge 0.9->0.10
tools/xep227toprosody.lua