Diff

prosodyctl @ 6298:6ddd7913913b

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Fri, 04 Jul 2014 15:54:37 +0200
parent 6162:fbc3b195dab8
child 6326:a3b9496673ee
line wrap: on
line diff