Diff

prosodyctl @ 5911:7051dc27e531

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 10 Nov 2013 23:10:46 +0000
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff