From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 22 Apr 2010 13:48:35 +0000 (+0200)
Subject: Merge commit 'origin/esteel/ignore'
X-Git-Tag: xonotic-v0.1.0preview~490
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=5f46e908547dffbaba1661966633ec2eea4c6940

Merge commit 'origin/esteel/ignore'
---

5f46e908547dffbaba1661966633ec2eea4c6940