Diff

prosodyctl @ 6907:a24c9c1edd67

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sat, 17 Oct 2015 19:30:58 +0200
parent 6845:bb7854355df1
child 6914:5df76208e050
line wrap: on
line diff