Diff

prosodyctl @ 5917:99bf636fce46

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