Diff

prosodyctl @ 6347:e1a7ccd82fce

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 10 Aug 2014 10:31:18 +0200
parent 6326:a3b9496673ee
child 6367:769a3577dd85
line wrap: on
line diff