Comparison

prosody.cfg.lua.dist @ 6081:19ada596aec4

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 15 Apr 2014 20:36:39 +0200
parent 6037:7bbe22d8dd09
child 6345:8e006348d0e5
comparison
equal deleted inserted replaced
6072:ce5428f6e3c3 6081:19ada596aec4