Diff

prosody.cfg.lua.dist @ 5947:49fb5835965e

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 16 Dec 2013 02:05:16 +0000
parent 5806:c914f4322581
child 6037:7bbe22d8dd09
line wrap: on
line diff