Merge remote-tracking branch 'origin/matthiaskrgr/exx_floor-wrn01-red'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:16:06 +0000 (11:16 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:16:06 +0000 (11:16 +0200)

Trivial merge