Diff

prosodyctl @ 5631:78bc91f0d74b

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 26 May 2013 22:59:06 +0200
parent 5620:8349ae2a44ce
child 5655:6d7f7548b2c9
line wrap: on
line diff