Diff

prosodyctl @ 4958:1f1c74ac9666

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