Merge remote branches 'origin/cbrutail/effects-beams' and 'origin/cbrutail/space_elev...
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 9 Feb 2011 12:31:06 +0000 (13:31 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 9 Feb 2011 12:31:06 +0000 (13:31 +0100)

Trivial merge