Diff

prosodyctl @ 6560:6f39c58bdcc4

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 26 Jan 2015 15:27:19 +0100
parent 6501:71b6e8b48a12
child 6584:c3a56f8847ac
line wrap: on
line diff