Diff

prosodyctl @ 5729:8de1f9290588

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 09 Jul 2013 00:04:30 +0100
parent 5723:24b6eb65480c
child 5809:be997c6a69be
line wrap: on
line diff