Diff

prosodyctl @ 3378:bb49ada7cf45

Merge Zash->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 16 Jul 2010 15:19:44 +0100
parent 3339:7893055e54d1
child 3471:482275e38224
line wrap: on
line diff