Diff

prosodyctl @ 6307:b6a47c7a496a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 09 Jul 2014 02:06:37 +0200
parent 6162:fbc3b195dab8
child 6326:a3b9496673ee
line wrap: on
line diff