Diff

prosodyctl @ 5955:b3d5aa57c454

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 18 Dec 2013 18:37:38 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff