Diff

prosodyctl @ 5855:275d4da9404f

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 05 Oct 2013 12:16:28 -0400
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff