Diff

prosodyctl @ 5920:0e5a38ba4c15

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 Nov 2013 11:59:43 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff