Diff

prosodyctl @ 5981:5718c6d15d34

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 12 Jan 2014 06:27:55 -0500
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff