Diff

util/prosodyctl.lua @ 5599:34e9f237b915

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 18 May 2013 13:20:46 +0200 (2013-05-18)
parent 5524:e9090966c803
child 5776:bd0ff8ae98a8
child 6356:fb1535328ac7
line wrap: on
line diff