Diff

prosodyctl @ 3653:029442834226

Merge darkrain->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 27 Nov 2010 21:12:44 +0000
parent 3630:e0c67b14d25f
child 3724:c12ebbd4ab61
line wrap: on
line diff