Diff

prosodyctl @ 5483:ed10252ee9c3

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 17 Apr 2013 19:11:57 +0200
parent 5457:953888c31071
child 5534:522e99b898a0
line wrap: on
line diff