Diff

prosodyctl @ 6001:34f43c8167e5

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 21 Jan 2014 03:26:04 +0000
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff