Diff

prosodyctl @ 6383:ec8878113907

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 02 Sep 2014 22:34:32 +0200
parent 6367:769a3577dd85
child 6405:61801dacc90b
line wrap: on
line diff