Diff

prosodyctl @ 5381:30484214d49b

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 23 Mar 2013 04:17:39 +0100
parent 5303:19a4a3462574
child 5394:3d1de30fefec
line wrap: on
line diff