Diff

prosodyctl @ 5753:11cb5f64d029

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 15 Jul 2013 23:43:37 +0100
parent 5723:24b6eb65480c
child 5809:be997c6a69be
line wrap: on
line diff