From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 12 Mar 2011 22:32:59 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/universal_reload_system
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=afe516adadb6bd8bc62a333b29064db24c73c6b5;p=xonotic%2Fxonotic-data.pk3dir.git

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

afe516adadb6bd8bc62a333b29064db24c73c6b5