Diff

prosodyctl @ 3060:6c1cfb4cea3c

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 20 May 2010 10:48:44 +0100
parent 3038:6b68355d615a
child 3161:73e93a48c0c1
line wrap: on
line diff