From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 10 Dec 2010 23:43:32 +0000 (+0100)
Subject: Merge commit 'c5518de'
X-Git-Tag: xonotic-v0.1.0preview~60
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97273c1f32ca88759eece730a32967d690b06a62;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'c5518de'
---

97273c1f32ca88759eece730a32967d690b06a62