Diff

prosodyctl @ 5127:cbcd173ad906

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 13 Sep 2012 18:49:25 +0100
parent 5101:a94c43cad081
child 5134:43c5227fdd3b
line wrap: on
line diff