Diff

prosodyctl @ 5819:441876452b9c

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 03 Sep 2013 12:32:18 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff