Merge branch 'nyov/instagib-rename'
authorMario <mario.mario@y7mail.com>
Thu, 27 Nov 2014 05:38:22 +0000 (16:38 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 27 Nov 2014 05:38:22 +0000 (16:38 +1100)
1  2 
scripts/entities.ent

Simple merge