Diff

prosodyctl @ 5511:764bda4b28b8

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 23 Apr 2013 15:14:47 +0100
parent 5457:953888c31071
child 5534:522e99b898a0
line wrap: on
line diff