Merge branch 'master' into mirceakitsune/player_cubemaps
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 17 Sep 2012 23:00:49 +0000 (02:00 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 17 Sep 2012 23:00:49 +0000 (02:00 +0300)

Trivial merge