Comparison

prosody.cfg.lua.dist @ 5231:4f9135e6c2f9

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 09 Dec 2012 12:39:49 +0100
parent 4775:ab73a32a655e
child 5293:fe9215155453
comparison
equal deleted inserted replaced
5226:c918aafb9c2e 5231:4f9135e6c2f9