Diff

prosody.cfg.lua.dist @ 5973:905b4fd863b4

Merge 0.10->trunk and Happy New Year!
author Kim Alvefur <zash@zash.se>
date Tue, 31 Dec 2013 19:09:34 +0100
parent 5806:c914f4322581
child 6037:7bbe22d8dd09
line wrap: on
line diff