Diff

prosodyctl @ 5178:fa6d61f2fe20

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