Diff

prosodyctl @ 6705:c269ab6ab98a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 15 May 2015 15:33:31 +0200
parent 6637:ecc039288edc
child 6711:76683a3f3d75
line wrap: on
line diff