Diff

prosodyctl @ 5715:ce9818e48ebb

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 26 Jun 2013 21:40:33 +0100
parent 5657:7957f14038e8
child 5723:24b6eb65480c
line wrap: on
line diff