Diff

prosodyctl @ 7516:f74ff35a4b03

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 23 Jul 2016 18:58:58 +0200
parent 7494:f82356adcd71
child 7530:f14094d10925
line wrap: on
line diff