Comparison

prosody.cfg.lua.dist @ 5595:b9c836dc8f2a

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 18 May 2013 12:03:03 +0100
parent 5573:ca9f99f7dcbc
child 5615:b678868cf2d8
comparison
equal deleted inserted replaced
5593:98a485212592 5595:b9c836dc8f2a