Diff

prosodyctl @ 5174:42765c80244c

Merge 0.9 -> trunk
author Kim Alvefur <zash@zash.se>
date Wed, 24 Oct 2012 19:56:22 +0200
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
line wrap: on
line diff