Diff

prosodyctl @ 6031:8796aa94c4b5

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 09 Mar 2014 23:47:53 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff