Diff

prosodyctl @ 1263:7797354dc9b5

Merge backout with following commits
author Matthew Wild <mwild1@gmail.com>
date Mon, 01 Jun 2009 02:06:02 +0100
parent 1205:23a079f50cab
child 1390:ef672c9fe7c9
line wrap: on
line diff