Diff

prosodyctl @ 6888:39c5c49616ab

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 27 Sep 2015 00:37:18 +0200 (2015-09-26)
parent 6845:bb7854355df1
child 6914:5df76208e050
line wrap: on
line diff