Diff

prosodyctl @ 5664:4f499eb63c04

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 09 Jun 2013 17:03:15 +0200
parent 5657:7957f14038e8
child 5723:24b6eb65480c
line wrap: on
line diff