Diff

prosodyctl @ 5925:826c522f303a

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 24 Nov 2013 14:24:21 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff