Diff

prosodyctl @ 1306:802630868d70

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