Diff

prosodyctl @ 4953:24c2150cc8b0

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