comparison prosody.cfg.lua.dist @ 5104:27b45d2c19fe

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 26 Aug 2012 19:58:59 +0100
parents ab73a32a655e
children fe9215155453
comparison
equal deleted inserted replaced
5103:5a1488369c35 5104:27b45d2c19fe