Diff

prosodyctl @ 5578:b8101bc0630f

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