Merge remote branch 'origin/mirceakitsune/new_loading_screens'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:12:03 +0000 (10:12 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:12:03 +0000 (10:12 +0200)

Trivial merge