Comparison

prosody.cfg.lua.dist @ 5866:10a16fdebe2c

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 10 Oct 2013 22:27:01 +0100
parent 5806:c914f4322581
child 6037:7bbe22d8dd09
comparison
equal deleted inserted replaced
5861:c3ee62b3bdfe 5866:10a16fdebe2c