Diff

util/prosodyctl.lua @ 5666:c1e1b265ee82

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 10 Jun 2013 14:37:02 +0200
parent 5524:e9090966c803
child 5776:bd0ff8ae98a8
child 6356:fb1535328ac7
line wrap: on
line diff