Merge branch 'master' into cbrutail/shaders_fx_xonotic2
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 11:10:50 +0000 (13:10 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 11:10:50 +0000 (13:10 +0200)

Trivial merge