From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 23 Jan 2011 16:01:49 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/universal_reload_system
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~85
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=36810e8ddba12c1959bc07e4c80630454c6f85a8

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

36810e8ddba12c1959bc07e4c80630454c6f85a8