Diff

prosodyctl @ 6177:b8a1143c8851

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 12 May 2014 01:18:27 +0200
parent 6162:fbc3b195dab8
child 6326:a3b9496673ee
line wrap: on
line diff