Diff

prosodyctl @ 5104:27b45d2c19fe

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 26 Aug 2012 19:58:59 +0100
parent 5101:a94c43cad081
child 5134:43c5227fdd3b
line wrap: on
line diff