Merge remote-tracking branch 'origin/mirceakitsune/new_loading_screens'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 19:06:54 +0000 (21:06 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 19:06:54 +0000 (21:06 +0200)

Trivial merge