Diff

prosodyctl @ 5866:10a16fdebe2c

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 10 Oct 2013 22:27:01 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff