Diff

prosodyctl @ 5501:12a42421bede

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