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)
commitd8525d1873bf3a5366e0faeeaff028ea1b4229da
treed57035b944cf6745ba6c90b69e369d9c1d8bdfb2
parent38b521858183cb7194a081e9d477a302b938bce5
parent53ae9c7c80197af07667356fb2213ff0717ee043
Merge remote-tracking branch 'origin/mirceakitsune/red_planet'