Diff

prosodyctl @ 6428:3ee09bfe16e1

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