Diff

util/prosodyctl.lua @ 6011:a35c9e52b02e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 06 Feb 2014 10:55:09 +0100
parent 5776:bd0ff8ae98a8
child 6062:6cc6b4d407df
line wrap: on
line diff