Diff

prosodyctl @ 6450:25d86b0f2147

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Sep 2014 03:08:03 +0200
parent 6405:61801dacc90b
child 6486:64146196b142
line wrap: on
line diff