Diff

prosodyctl @ 5722:43de2a3f723a

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 29 Jun 2013 22:49:56 +0200
parent 5657:7957f14038e8
child 5723:24b6eb65480c
line wrap: on
line diff