Diff

prosodyctl @ 6729:daa5c83b2879

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 21 May 2015 22:56:39 +0200
parent 6711:76683a3f3d75
child 6751:18f18bceb662
line wrap: on
line diff