Diff

prosodyctl @ 2919:8ce6b680975a

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 22 Mar 2010 15:05:35 +0000
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff