Comparison

prosody.cfg.lua.dist @ 5875:e4150e6720f7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 15 Oct 2013 10:48:11 +0200
parent 5806:c914f4322581
child 6037:7bbe22d8dd09
comparison
equal deleted inserted replaced
5873:4669bd7038c7 5875:e4150e6720f7