Diff

prosodyctl @ 5986:d98b1884ed0f

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 18 Jan 2014 18:44:58 +0000
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff