Comparison

prosodyctl @ 5540:34ec16920685

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 29 Apr 2013 10:54:25 +0100
parent 5534:522e99b898a0
child 5554:e91db0aac408
comparison
equal deleted inserted replaced
5536:abb6c6e3d6dc 5540:34ec16920685