Diff

prosodyctl @ 5935:a367bae38385

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Wed, 11 Dec 2013 22:31:48 +0000
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff