From: terencehill <piuntn@gmail.com>
Date: Sun, 4 Jul 2010 23:08:29 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/misc_bugfixes
X-Git-Tag: xonotic-v0.1.0preview~465^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=84f2a6cddce774e25f31050e71992c00a755e171;p=xonotic%2Fxonotic-data.pk3dir.git

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

84f2a6cddce774e25f31050e71992c00a755e171