comparison util/prosodyctl.lua @ 5160:da7fe5de82fb

Merge 0.9 -> trunk (like this?)
author Kim Alvefur <zash@zash.se>
date Sat, 29 Sep 2012 01:05:17 +0200
parents ae8a993b598d
children 27de7cc94111
comparison
equal deleted inserted replaced
5159:0638ff1e1a5a 5160:da7fe5de82fb