Merge branch 'master' into mirceakitsune/world_cubemaps
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 25 Aug 2012 12:04:23 +0000 (15:04 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 25 Aug 2012 12:04:23 +0000 (15:04 +0300)

Trivial merge