From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Thu, 13 Jun 2013 20:45:14 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/gitignore
X-Git-Tag: xonotic-v0.8.0~389
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c58773440e625c00b8bd30e5d43337914f7b922b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into matthiaskrgr/gitignore
---

c58773440e625c00b8bd30e5d43337914f7b922b