Diff

prosodyctl @ 5850:e8c743f4213f

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Mon, 30 Sep 2013 23:46:38 +0100
parent 5809:be997c6a69be
child 6038:b3ceb7627e27
line wrap: on
line diff