Diff

prosodyctl @ 1448:700ea94e1769

Automated merge with http://waqas.ath.cx:8000/
author Matthew Wild <mwild1@gmail.com>
date Mon, 29 Jun 2009 14:13:49 +0100
parent 1390:ef672c9fe7c9
child 1458:fce75b4efda9
line wrap: on
line diff