Merge remote branch 'origin/cbrutail/decals-xonotic'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 07:34:57 +0000 (08:34 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 07:34:57 +0000 (08:34 +0100)

Trivial merge