Diff

prosodyctl @ 1235:be8b51a8ab03

Automated merge with http://waqas.ath.cx:8000/
author Matthew Wild <mwild1@gmail.com>
date Sat, 30 May 2009 13:49:38 +0100
parent 1205:23a079f50cab
child 1390:ef672c9fe7c9
line wrap: on
line diff