Diff

prosodyctl @ 5677:9afc94c4346e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 13 Jun 2013 00:09:56 +0100
parent 5657:7957f14038e8
child 5723:24b6eb65480c
line wrap: on
line diff