Diff

prosodyctl @ 2690:542d633e0280

Merge 0.7 with 0.7
author Matthew Wild <mwild1@gmail.com>
date Sun, 21 Feb 2010 16:43:29 +0000
parent 2587:c37f971f0fe6
child 2696:cb5acafbec62
line wrap: on
line diff