Diff

prosodyctl @ 6965:5360bdf93fce

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 03 Dec 2015 16:13:33 +0000
parent 6960:50e2277ea05f
child 7065:4fc3c008976f
line wrap: on
line diff