From: terencehill <piuntn@gmail.com>
Date: Sat, 30 Apr 2011 18:39:44 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/italian_update
X-Git-Tag: xonotic-v0.5.0~264^2~1^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8486d37cd40c66f622bfa3eb57e18fc401bee074;p=xonotic%2Fxonotic-data.pk3dir.git

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

8486d37cd40c66f622bfa3eb57e18fc401bee074