Comparison

prosody.cfg.lua.dist @ 4282:f5a46b73432b

Merge 0.7->0.8
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jun 2011 00:26:23 +0100
parent 4233:3c644c3b10e2
child 4497:f42a0833c47c
comparison
equal deleted inserted replaced
4278:67ce42aa7419 4282:f5a46b73432b