Diff

prosodyctl @ 6354:bbb4a82db32e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 Aug 2014 19:22:08 +0200
parent 6326:a3b9496673ee
child 6367:769a3577dd85
line wrap: on
line diff