Diff

prosodyctl @ 5718:16db80c2b74d

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 29 Jun 2013 10:11:55 +0100
parent 5657:7957f14038e8
child 5723:24b6eb65480c
line wrap: on
line diff