Diff

prosodyctl @ 6290:54e748acc07a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 30 Jun 2014 13:12:16 +0200
parent 6162:fbc3b195dab8
child 6326:a3b9496673ee
line wrap: on
line diff