Diff

prosodyctl @ 6027:8c69cea8a1bf

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Wed, 26 Feb 2014 22:21:55 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff