Diff

util/prosodyctl.lua @ 5483:ed10252ee9c3

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 17 Apr 2013 19:11:57 +0200
parent 5379:27de7cc94111
child 5524:e9090966c803
line wrap: on
line diff