Merge remote-tracking branch 'origin/Mario/red-planet_nuke'
authorRudolf Polzer <divverent@xonotic.org>
Tue, 17 Jun 2014 14:01:36 +0000 (16:01 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 17 Jun 2014 14:01:36 +0000 (16:01 +0200)
commit9a2422e178f8da24ddfd6d38173a6123e25a6d26
treee5501adb016f6ab91ddeec54dea790801ecc52ff
parent50c05a648d1edd07e90762965c4339122c5028d5
parent627f44c641c186dc1a73d0da8ab84e0fc15bb59b
Merge remote-tracking branch 'origin/Mario/red-planet_nuke'

* origin/Mario/red-planet_nuke:
  Remove red-planet