Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 30 May 2016 11:17:28 +0000 (13:17 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 30 May 2016 11:17:28 +0000 (13:17 +0200)
commitc18153e25135af31149458afbb695fa8e84f345f
tree3cd74c2933ec9ec19231b044ca06644c40ae2d16
parent367213c4a9809120ba012f6a1d1c845dc183bfe5
parenta63023929f82db6ae89be2b46b05b7f834a02876
Merge 0.10->trunk
prosodyctl