Diff

prosodyctl @ 5321:33813f000015

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 03 Feb 2013 15:52:27 +0100 (2013-02-03)
parent 5303:19a4a3462574
child 5394:3d1de30fefec
line wrap: on
line diff