Diff

prosodyctl @ 5666:c1e1b265ee82

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 10 Jun 2013 14:37:02 +0200
parent 5657:7957f14038e8
child 5723:24b6eb65480c
line wrap: on
line diff