Diff

prosodyctl @ 6835:3afb8aa78069

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 17 Sep 2015 22:15:26 +0200
parent 6784:4da860edc27c
child 6837:13b44929ae49
line wrap: on
line diff