Diff

prosodyctl @ 3509:72cb8b6536b9

Merge with trunk.
author Waqas Hussain <waqas20@gmail.com>
date Mon, 27 Sep 2010 19:51:14 +0500
parent 3481:72d3c8029178
child 3627:9e62937c9757
line wrap: on
line diff