Diff

prosodyctl @ 7304:b6adb7c1a645

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 19 Mar 2016 22:46:41 +0100
parent 7302:92d86016e1e3
child 7313:316ca5c15255
line wrap: on
line diff