Diff

prosodyctl @ 4575:e0c4ac7749a6

Merge backout
author Matthew Wild <mwild1@gmail.com>
date Fri, 24 Feb 2012 16:25:45 +0000
parent 4476:53ce21286b8c
child 4487:5f466a50e78b
line wrap: on
line diff