Diff

prosodyctl @ 6525:7c273da3cff6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Nov 2014 15:01:47 +0100
parent 6501:71b6e8b48a12
child 6584:c3a56f8847ac
line wrap: on
line diff