Diff

prosodyctl @ 6018:4a276653a2c9

Merge 0.10 -> trunk
author Kim Alvefur <zash@zash.se>
date Wed, 12 Feb 2014 19:26:54 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff