Diff

prosodyctl @ 3159:b01a699ddf64

Merge backout
author Matthew Wild <mwild1@gmail.com>
date Fri, 04 Jun 2010 11:59:27 +0100
parent 3038:6b68355d615a
child 3161:73e93a48c0c1
line wrap: on
line diff