From: terencehill <piuntn@gmail.com>
Date: Sun, 20 Mar 2011 17:29:56 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/misc_bugfixes
X-Git-Tag: xonotic-v0.5.0~305^2~28^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7438172c447ae3ce04f11591975dba52fd7ac670;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/misc_bugfixes
---

7438172c447ae3ce04f11591975dba52fd7ac670