Diff

prosodyctl @ 2522:9f9d605ef65d

Merge backed out changeset
author Matthew Wild <mwild1@gmail.com>
date Fri, 29 Jan 2010 03:07:30 +0000
parent 2515:50517948705c
child 2566:48dfd5c9dc5d
line wrap: on
line diff