Comparison

prosodyctl @ 3372:395f692b3182

Merge with backout
author Matthew Wild <mwild1@gmail.com>
date Thu, 15 Jul 2010 08:27:56 +0100
parent 3339:7893055e54d1
child 3471:482275e38224
comparison
equal deleted inserted replaced
3370:7c87af1c9a68 3372:395f692b3182