Comparison

prosody.cfg.lua.dist @ 5540:34ec16920685

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 29 Apr 2013 10:54:25 +0100
parent 5409:8e98a58ab6a3
child 5573:ca9f99f7dcbc
comparison
equal deleted inserted replaced
5536:abb6c6e3d6dc 5540:34ec16920685