Diff

prosodyctl @ 5249:d1baef49be21

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 16 Dec 2012 08:37:14 +0100
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff