Diff

prosodyctl @ 4951:e3ff2656cb37

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