Diff

prosodyctl @ 4859:54eb17126bd3

Merge with backout
author Matthew Wild <mwild1@gmail.com>
date Fri, 11 May 2012 21:35:08 +0100
parent 4827:fefbfd76d2d3
child 4872:b2059452fb55
line wrap: on
line diff