From: terencehill <piuntn@gmail.com>
Date: Thu, 5 Apr 2012 09:27:24 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/freezetag_fixes
X-Git-Tag: xonotic-v0.7.0~269^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c03782fac2e6dd7b6e7c3fea9f9d3e0b1343955;p=xonotic%2Fxonotic-data.pk3dir.git

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

0c03782fac2e6dd7b6e7c3fea9f9d3e0b1343955