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

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

d499d939ae90734c284c85058612aebbd0e5f273