Diff

prosodyctl @ 5574:40fe8bd35eaa

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 11 May 2013 13:55:14 +0100
parent 5554:e91db0aac408
child 5584:1d841117117c
line wrap: on
line diff