Diff

util/prosodyctl.lua @ 6839:298182fd2387

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 19 Sep 2015 17:51:20 +0200
parent 6777:5de6b93d0190
child 7259:d8300985f2bb
line wrap: on
line diff