Diff

prosodyctl @ 6464:737c81bd898e

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