Comparison

prosody.cfg.lua.dist @ 6290:54e748acc07a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 30 Jun 2014 13:12:16 +0200
parent 6037:7bbe22d8dd09
child 6345:8e006348d0e5
comparison
equal deleted inserted replaced
6286:ec6e8d5a3fd3 6290:54e748acc07a