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

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

b20530900329e0ce4e3c22d729aa4367b83f2eb1