Diff

prosodyctl @ 3899:eff0c5fe9119

Merge 0.8->trunk (uh-oh)
author Matthew Wild <mwild1@gmail.com>
date Sun, 19 Dec 2010 02:36:56 +0000
parent 3777:5ecbcef42ffb
child 3904:f93163081b3c
line wrap: on
line diff