Comparison

prosodyctl @ 5164:12f5a3438090

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 29 Sep 2012 17:07:50 +0100
parent 5160:da7fe5de82fb
child 5303:19a4a3462574
comparison
equal deleted inserted replaced
5162:cda4d3f01ddd 5164:12f5a3438090