Diff

prosodyctl @ 7505:3d950ee0de35

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 14 Jul 2016 13:41:02 +0200
parent 7494:f82356adcd71
child 7530:f14094d10925
line wrap: on
line diff