Diff

prosodyctl @ 5239:cf4954f1c35a

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 11 Dec 2012 23:41:02 +0100
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff