Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 17:47:32 +0000 (18:47 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 17:47:32 +0000 (18:47 +0100)
commit0406b86d16ce8e4121c880c2b5a4dff07c0e1bc0
treeef70d9e5fcb3bc2afecf968c113b4ca55b4cac65
parenta23a33b3fa46dd449a547cd17ed33389d0969ec8
parentf2615fac067ffeccd7d431ece156603837898124
Merge 0.10->trunk
prosodyctl