Diff

prosodyctl @ 6007:ff24bc2d41a6

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Mon, 03 Feb 2014 07:23:33 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff