Diff

prosodyctl @ 6861:39789f1669cb

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 25 Sep 2015 18:03:44 +0200
parent 6845:bb7854355df1
child 6914:5df76208e050
line wrap: on
line diff