Diff

prosodyctl @ 6905:0e81e3dab896

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