Comparison

prosody.cfg.lua.dist @ 6032:c0ee152400ff

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 09 Mar 2014 23:48:32 +0100
parent 5806:c914f4322581
child 6037:7bbe22d8dd09
comparison
equal deleted inserted replaced
6028:14c63b8c3e06 6032:c0ee152400ff