Comparison

prosody.cfg.lua.dist @ 6385:d87195d53d84

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 03 Sep 2014 03:35:48 +0200
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
comparison
equal deleted inserted replaced
6383:ec8878113907 6385:d87195d53d84