Diff

prosodyctl @ 5942:b5e8843cfbeb

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 14 Dec 2013 17:25:55 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff