From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 30 Aug 2011 14:04:46 +0000 (+0200)
Subject: Merge commit 'a7829e92ab32fb6859749938a2cd1294fda41d50'
X-Git-Tag: xonotic-v0.5.0~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49aad9845609a2d149bab55cec9daf285b13dfa2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'a7829e92ab32fb6859749938a2cd1294fda41d50'
---

49aad9845609a2d149bab55cec9daf285b13dfa2