Diff

util/prosodyctl.lua @ 6285:ea60d0441df7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 21 Jun 2014 15:05:52 +0200
parent 6062:6cc6b4d407df
child 6367:769a3577dd85
line wrap: on
line diff