Diff

util/prosodyctl.lua @ 5271:f716a3c58b4b

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 26 Dec 2012 20:35:40 +0100
parent 5102:ae8a993b598d
child 5379:27de7cc94111
line wrap: on
line diff