Diff

prosodyctl @ 6418:ae798314347c

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