Diff

prosodyctl @ 5493:307c4b1259b3

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 18 Apr 2013 00:41:25 +0100
parent 5457:953888c31071
child 5534:522e99b898a0
line wrap: on
line diff