From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 10 Mar 2011 14:09:50 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/universal_reload_system
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~6
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=725a914113fa32f1f9d99fc3becf527f9d13c99c

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

725a914113fa32f1f9d99fc3becf527f9d13c99c