Diff

prosodyctl @ 1229:331a68645f67

Automated merge with http://waqas.ath.cx:8000/
author Matthew Wild <mwild1@gmail.com>
date Fri, 29 May 2009 22:06:21 +0100
parent 1205:23a079f50cab
child 1390:ef672c9fe7c9
line wrap: on
line diff