Merge branch 'fruitiex/textures' into fruitiex/runningmanctf
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 20:18:59 +0000 (23:18 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 20:18:59 +0000 (23:18 +0300)

Trivial merge