Merge with 0.9
authorMatthew Wild <mwild1@gmail.com>
Wed, 8 Feb 2012 15:20:07 +0000 (16:20 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 8 Feb 2012 15:20:07 +0000 (16:20 +0100)
commita5c8585e3959d8db91c7aa8094c35013531c4b83
treec463ea6890db5e5b70f64d2f3d3fd7d986b74f71
parenta0ebbb60eab95ec929bec6077bcf23d6a7a0f7f4
parent6f766caddf32b2ac269d3663486e493d950b8119
Merge with 0.9
util/prosodyctl.lua