Diff

prosodyctl @ 6650:cf15b18e9810

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 05 May 2015 01:34:20 +0200
parent 6637:ecc039288edc
child 6711:76683a3f3d75
line wrap: on
line diff