Diff

prosody.cfg.lua.dist @ 6456:a8d9d3eea6f4

Merge 0.10->trunk
author daurnimator <quae@daurnimator.com>
date Mon, 29 Sep 2014 13:59:16 -0400
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
line wrap: on
line diff