Diff

prosodyctl @ 6511:5f9389af5115

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 09 Nov 2014 20:32:33 +0100
parent 6501:71b6e8b48a12
child 6584:c3a56f8847ac
line wrap: on
line diff