Diff

prosodyctl @ 6316:e144a1b67c30

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 25 Jul 2014 13:54:47 +0100
parent 6162:fbc3b195dab8
child 6326:a3b9496673ee
line wrap: on
line diff