Diff

prosodyctl @ 6693:365f0f885aa5

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 14 May 2015 00:24:21 +0200
parent 6637:ecc039288edc
child 6711:76683a3f3d75
line wrap: on
line diff