Comparison

prosodyctl @ 4126:5044698a9d90

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 21 Jan 2011 14:02:56 +0000
parent 4095:6ad7ed619d37
child 4142:caa78589598f
comparison
equal deleted inserted replaced
4122:2e4bc196fd2a 4126:5044698a9d90