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

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

766e44a12d34eda9b7e9b7963e6e083e877dfa8d