Diff

prosodyctl @ 6083:31b2f82e2d3c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 15 Apr 2014 21:54:44 +0200
parent 6062:6cc6b4d407df
child 6158:08e9c9d0beb3
line wrap: on
line diff