Diff

prosodyctl @ 6603:e702ae7aa3d9

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 26 Mar 2015 16:49:03 +0000
parent 6587:54306208f30b
child 6611:65dd3770bcb0
line wrap: on
line diff