Diff

prosodyctl @ 7496:98c8d14be4ef

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Wed, 13 Jul 2016 18:43:28 +0200
parent 7483:8c5320a4bfaf
child 7494:f82356adcd71
child 7528:50365a496890
line wrap: on
line diff