Diff

prosodyctl @ 3124:21e60658767d

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 24 May 2010 19:46:12 +0100
parent 3038:6b68355d615a
child 3161:73e93a48c0c1
line wrap: on
line diff