Diff

prosodyctl @ 6952:db085e55555f

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 03 Dec 2015 14:59:55 +0000
parent 6914:5df76208e050
child 6957:e442016918a9
line wrap: on
line diff