Diff

prosodyctl @ 6572:c60c199cc7f0

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 31 Jan 2015 12:25:24 +0000
parent 6501:71b6e8b48a12
child 6584:c3a56f8847ac
line wrap: on
line diff