Diff

prosodyctl @ 5446:51686426cac2

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 08 Apr 2013 15:32:51 +0100
parent 5442:e66973c81e89
child 5457:953888c31071
line wrap: on
line diff