Diff

prosodyctl @ 5928:1f6923702fc3

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Thu, 28 Nov 2013 16:17:21 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff