From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 16 Jun 2013 16:33:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/matthiaskrgr/gitignore'
X-Git-Tag: xonotic-v0.8.0~118
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=d33a20e42636a0c28007862b94e07ad117cd73dd;p=xonotic%2Fxonotic.git

Merge remote-tracking branch 'origin/matthiaskrgr/gitignore'
---

d33a20e42636a0c28007862b94e07ad117cd73dd