Diff

prosodyctl @ 6011:a35c9e52b02e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 06 Feb 2014 10:55:09 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff