Diff

prosodyctl @ 6904:633af47470c8

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 11 Oct 2015 20:00:15 +0200
parent 6845:bb7854355df1
child 6914:5df76208e050
line wrap: on
line diff