Merge branch 'master' into cbrutail/shaders_fx_xonotic2
authorRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 13:01:39 +0000 (15:01 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 13:01:39 +0000 (15:01 +0200)

Trivial merge