Diff

prosodyctl @ 3048:22f1723591f8

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 18 May 2010 00:47:35 +0100
parent 3038:6b68355d615a
child 3161:73e93a48c0c1
line wrap: on
line diff