Diff

prosodyctl @ 6322:c3d750a43d8c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 25 Jul 2014 21:16:52 +0200
parent 6162:fbc3b195dab8
child 6326:a3b9496673ee
line wrap: on
line diff