Comparison

prosody.cfg.lua.dist @ 5249:d1baef49be21

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 16 Dec 2012 08:37:14 +0100
parent 4775:ab73a32a655e
child 5293:fe9215155453
comparison
equal deleted inserted replaced
5246:eba55873ef29 5249:d1baef49be21