Diff

prosodyctl @ 7581:01d0d466d7be

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Thu, 18 Aug 2016 15:16:02 +0200
parent 7528:50365a496890
child 7530:f14094d10925
child 7679:589e27b47d56
line wrap: on
line diff