Diff

util/prosodyctl.lua @ 5455:16493e410fa8

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 08 Apr 2013 22:43:27 +0200
parent 5379:27de7cc94111
child 5524:e9090966c803
line wrap: on
line diff