Diff

prosodyctl @ 6576:b7796a46aec2

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sat, 21 Feb 2015 10:34:56 +0100
parent 6501:71b6e8b48a12
child 6584:c3a56f8847ac
line wrap: on
line diff