Merge remote-tracking branch 'jn/random-fixes'
authorPerttu Ahola <celeron55@gmail.com>
Tue, 28 Feb 2012 19:47:15 +0000 (21:47 +0200)
committerPerttu Ahola <celeron55@gmail.com>
Tue, 28 Feb 2012 19:47:15 +0000 (21:47 +0200)
1  2 
data/mods/default/init.lua

Simple merge