Diff

prosodyctl @ 5189:7f6cc8ed2247

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 22 Nov 2012 19:38:42 +0000
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff