From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 13 May 2011 20:04:01 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/new_loading_screens
X-Git-Tag: xonotic-v0.5.0~257^2~1^2~1
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=58531c8828fb505a5de4c2236406788df1cb9889

Merge branch 'master' into mirceakitsune/new_loading_screens
---

58531c8828fb505a5de4c2236406788df1cb9889