Diff

prosodyctl @ 5275:03dc0ae27499

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 28 Dec 2012 12:50:55 +0000
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff