Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 08:25:52 +0000 (10:25 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 08:25:52 +0000 (10:25 +0200)
commitbca35c227886965fb03723280c0fc79bdadb5faa
tree70bb7c1b4daa1fcadb8167d7d6a69bbdabda548e
parent274c1242b6a14f75e233d67d2fe2073cd29028f2
parent77921187498c8eba6ca32f9b3d3a71ace5909e24
Merge 0.10->trunk
prosodyctl
tests/test.lua