Diff

prosodyctl @ 7308:397f45107795

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 21 Mar 2016 14:52:43 +0100
parent 7302:92d86016e1e3
child 7313:316ca5c15255
line wrap: on
line diff