Diff

prosodyctl @ 3400:502a634f0578

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 23 Jul 2010 09:22:27 +0100
parent 3339:7893055e54d1
child 3471:482275e38224
line wrap: on
line diff