Diff

prosodyctl @ 4843:d91dda67647a

Merge with backout
author Matthew Wild <mwild1@gmail.com>
date Fri, 11 May 2012 01:45:36 +0100
parent 4815:04e6115e060b
child 4824:73e261ed00a9
line wrap: on
line diff