Diff

prosodyctl @ 5273:746f07d280e2

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 28 Dec 2012 03:03:56 +0100
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff