Comparison

prosody.cfg.lua.dist @ 6059:0cbdf7243540

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 03 Apr 2014 23:54:58 +0200
parent 6037:7bbe22d8dd09
child 6345:8e006348d0e5
comparison
equal deleted inserted replaced
6055:596539a30e9b 6059:0cbdf7243540