comparison prosodyctl @ 2896:49db4238ecfd

Merge darkrain->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 18 Mar 2010 01:31:37 +0000
parents c2dde8bda3fe
children 518e3f6f9946 8f78e8164032
comparison
equal deleted inserted replaced
2893:98cbc092c64c 2896:49db4238ecfd