From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 15 Jun 2011 14:24:49 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.5.0~199^2~18^2~1
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=de4f4eac32c12e8d5741c354bdfe7ed8defda448

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
---

de4f4eac32c12e8d5741c354bdfe7ed8defda448