Diff

prosodyctl @ 6465:ab68bb837fe0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Oct 2014 15:37:46 +0200
parent 6405:61801dacc90b
child 6486:64146196b142
line wrap: on
line diff