Comparison

prosodyctl @ 2919:8ce6b680975a

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 22 Mar 2010 15:05:35 +0000 (2010-03-22)
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
comparison
equal deleted inserted replaced
2916:c29ecf0cadff 2919:8ce6b680975a