Diff

prosodyctl @ 4970:eeff01224865

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Jul 2012 17:08:09 +0100
parent 4935:bc62abceef07
child 5024:d25e1b9332cc
line wrap: on
line diff