Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 17:25:16 +0000 (18:25 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 17:25:16 +0000 (18:25 +0100)
commita23a33b3fa46dd449a547cd17ed33389d0969ec8
treebb3403db134521ba676e701b351f18ca8de30f74
parentdf4d9d12f4ed5f9bb1341928005ad2f57cb0deb4
parent1c8107c16696118e07c456292f02f0d640b4953f
Merge 0.10->trunk
prosodyctl