Diff

prosodyctl @ 1362:75c39ac6efa0

Merge with trunk
author Waqas Hussain <waqas20@gmail.com>
date Sat, 20 Jun 2009 01:05:06 +0500
parent 1205:23a079f50cab
child 1390:ef672c9fe7c9
line wrap: on
line diff