Comparison

prosodyctl @ 4948:2c1de519f639

Merge with backout
author Matthew Wild <mwild1@gmail.com>
date Sun, 08 Jul 2012 18:48:28 +0100
parent 4935:bc62abceef07
child 5024:d25e1b9332cc
comparison
equal deleted inserted replaced
4946:2975c7008ccd 4948:2c1de519f639