Merge remote-tracking branch 'origin/cbrutail/texturesex2x-greentrims'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 9 Oct 2011 14:21:34 +0000 (16:21 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 9 Oct 2011 14:21:34 +0000 (16:21 +0200)

Trivial merge