Diff

prosodyctl @ 6928:02717098cbba

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Nov 2015 15:52:10 +0000
parent 6914:5df76208e050
child 6957:e442016918a9
line wrap: on
line diff