Comparison

prosodyctl @ 4107:c9363102afd2

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 10 Jan 2011 16:55:14 +0000
parent 4095:6ad7ed619d37
child 4142:caa78589598f
comparison
equal deleted inserted replaced
4104:582ba9c459ad 4107:c9363102afd2