From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 19 Jan 2011 06:43:22 +0000 (+0100)
Subject: Merge commit '961fd2402928e52177ae5f9d6bc8a6d097ec918f'
X-Git-Tag: xonotic-v0.5.0~318^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64ff98c516fe190184f4dbccc3ec2ab1ab4d5587;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit '961fd2402928e52177ae5f9d6bc8a6d097ec918f'
---

64ff98c516fe190184f4dbccc3ec2ab1ab4d5587