Diff

prosodyctl @ 6000:0f6399c86c10

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Tue, 21 Jan 2014 03:24:40 +0000
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff