Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 24 Feb 2016 10:20:00 +0000 (11:20 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 24 Feb 2016 10:20:00 +0000 (11:20 +0100)
commita05c09b7bbf6c4dc3e967136f926e7da1248e666
tree622805c9db20beffd1a40b8ac7ee7abc800540bd
parent64a429222baa79fa17f87dbc90c7738c5caabb73
parent5a71b45a0f9e8a365951240914642c706e863d45
Merge 0.10->trunk
prosodyctl