Diff

prosodyctl @ 1328:0709c9564b1c

Automated merge with http://waqas.ath.cx:8000/
author Matthew Wild <mwild1@gmail.com>
date Sun, 07 Jun 2009 14:19:36 +0100
parent 1205:23a079f50cab
child 1390:ef672c9fe7c9
line wrap: on
line diff