Diff

prosodyctl @ 5499:063d1f706ba7

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