From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Sun, 11 Apr 2010 18:12:33 +0000 (+0200)
Subject: Merge commit 'origin/esteel/ignore'
X-Git-Tag: xonotic-v0.1.0preview~660
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=52ce8712d7467c8e6f5b168aa015bf26835463d1;p=xonotic%2Fxonotic-data.pk3dir.git

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

52ce8712d7467c8e6f5b168aa015bf26835463d1