Comparison

prosodyctl @ 3072:6f68b1700e02

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 21 May 2010 19:28:56 +0100
parent 3038:6b68355d615a
child 3161:73e93a48c0c1
comparison
equal deleted inserted replaced
3067:8dfa246a4413 3072:6f68b1700e02