Merge branch 'origin/master' (early part) into cbrutail/shaders_fx_xonotic2
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:01:02 +0000 (12:01 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:01:02 +0000 (12:01 +0200)

Trivial merge