Comparison

prosodyctl @ 2962:0caed31a7306

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 03 Apr 2010 23:09:59 +0100
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
comparison
equal deleted inserted replaced
2954:24483a7bf420 2962:0caed31a7306