Diff

prosodyctl @ 5873:4669bd7038c7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 15 Oct 2013 01:38:02 +0200
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff