Comparison

prosodyctl @ 6623:0da3e10b3333

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Apr 2015 15:22:33 +0200
parent 6612:6cc48b51d699
child 6637:ecc039288edc
comparison
equal deleted inserted replaced
6621:352fa2cae1c9 6623:0da3e10b3333