Comparison

prosody.cfg.lua.dist @ 2942:29ec7cd77f81

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 25 Mar 2010 12:33:45 +0000
parent 2931:de4daf300f19
child 2984:3094166cfdd5
comparison
equal deleted inserted replaced
2940:7486b9216879 2942:29ec7cd77f81