Diff

prosodyctl @ 5951:09645f58c14c

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 16 Dec 2013 23:32:29 +0000
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff