Diff

prosodyctl @ 2965:0fe9cfaeaed7

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 07 Apr 2010 21:01:06 +0100
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff