From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 13 Sep 2011 18:49:23 +0000 (+0200)
Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.6.0~40^2~141
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=36e562cee82f6de6d39958989d89bd79d1689680;p=xonotic%2Fxonotic-data.pk3dir.git

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

36e562cee82f6de6d39958989d89bd79d1689680