Merge remote branch 'origin/mirceakitsune/red_planet_tempcollisions'
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 27 Aug 2011 10:06:42 +0000 (12:06 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 27 Aug 2011 10:06:42 +0000 (12:06 +0200)

Trivial merge