Diff

prosodyctl @ 6385:d87195d53d84

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 03 Sep 2014 03:35:48 +0200
parent 6367:769a3577dd85
child 6405:61801dacc90b
line wrap: on
line diff