Merge remote-tracking branch 'origin/mirceakitsune/red_planet'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 22 May 2011 18:01:04 +0000 (20:01 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 22 May 2011 18:01:04 +0000 (20:01 +0200)

Trivial merge