From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 28 Feb 2011 13:27:21 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/universal_reload_system
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f2562c4ce3305b5d3724ae03015d35abdaa12b83;p=xonotic%2Fxonotic-data.pk3dir.git

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

f2562c4ce3305b5d3724ae03015d35abdaa12b83