Diff

prosodyctl @ 5497:b42781a96174

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 19 Apr 2013 13:30:37 +0100
parent 5457:953888c31071
child 5534:522e99b898a0
line wrap: on
line diff