Diff

prosodyctl @ 7106:74798480b52e

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Wed, 27 Jan 2016 20:32:01 +0000
parent 7082:8b590fc77d91
child 7147:81e54032d14d
child 7190:7a14ea196db3
line wrap: on
line diff