Diff

prosody.cfg.lua.dist @ 5205:f7ff48494c2b

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 29 Nov 2012 07:16:45 +0500
parent 4775:ab73a32a655e
child 5293:fe9215155453
line wrap: on
line diff