Comparison

prosodyctl @ 2985:fde53d82fde0

Merge 0.7->trunk (with MUC needing checking, waqas)
author Matthew Wild <mwild1@gmail.com>
date Tue, 04 May 2010 23:36:50 +0100
parent 2706:c2dde8bda3fe
child 3013:518e3f6f9946
child 3233:8f78e8164032
comparison
equal deleted inserted replaced
2975:c1a2e210f47e 2985:fde53d82fde0