Diff

prosodyctl @ 2942:29ec7cd77f81

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 25 Mar 2010 12:33:45 +0000 (2010-03-25)
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
line wrap: on
line diff