Diff

prosodyctl @ 4956:bc26e6d519ae

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