Diff

prosodyctl @ 6028:14c63b8c3e06

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