Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 11 Mar 2016 12:41:10 +0000 (13:41 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 11 Mar 2016 12:41:10 +0000 (13:41 +0100)
commit18e5a8b84d7b7e3dd2af7eb479c3e051295e6c6b
tree710b7f985a69f62398c414a115c614a1dc48de09
parentac5c95881f73ad62a66d47dda4384fa6988b2761
parent594b311b18056ef9a38293b3eb0f4d1371a95fb8
Merge 0.10->trunk
prosodyctl