From: Akari <hetors.email@gmail.com>
Date: Mon, 10 Jan 2011 09:58:38 +0000 (+0200)
Subject: Merge branch 'master' into akari/freezetag-fixes
X-Git-Tag: xonotic-v0.5.0~263^2~12^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e4a382ddd408e08e694a8a34530b1b13c09c184;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into akari/freezetag-fixes
---

7e4a382ddd408e08e694a8a34530b1b13c09c184