Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 25 Feb 2016 14:40:35 +0000 (15:40 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 25 Feb 2016 14:40:35 +0000 (15:40 +0100)
commit88b9f0b33cf2c6d3d77af973d80ce20556a9265b
tree061aa689776843e919cf767b17c728652e9f1417
parenta05c09b7bbf6c4dc3e967136f926e7da1248e666
parent899b9ee7393e13b3b5a5561effd4f31aa11d8bd3
Merge 0.10->trunk
prosodyctl