Diff

prosodyctl @ 6284:b49540983320

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sat, 21 Jun 2014 15:05:21 +0200
parent 6162:fbc3b195dab8
child 6326:a3b9496673ee
line wrap: on
line diff