Merge branch 'master' into cbrutail/decals-xonotic
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 08:06:42 +0000 (09:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 08:06:42 +0000 (09:06 +0100)

Trivial merge