Diff

prosodyctl @ 5926:4fd1e660744d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 24 Nov 2013 14:24:53 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff