Merge remote branch 'origin/cbrutail/shaderfix-forcefileds'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Nov 2010 12:01:34 +0000 (13:01 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Nov 2010 12:01:34 +0000 (13:01 +0100)

Trivial merge