Comparison

prosodyctl @ 5224:ba51d0917c64

Merge 0.9->trunk.
author Waqas Hussain <waqas20@gmail.com>
date Mon, 03 Dec 2012 10:04:34 +0500
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
comparison
equal deleted inserted replaced
5221:115cf8252be8 5224:ba51d0917c64