From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 24 Aug 2011 12:11:18 +0000 (+0200)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.5.0~66
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f3cd6e8e994c399d573bf829b43ef04efb6d1a67;p=xonotic%2Fxonotic-data.pk3dir.git

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

f3cd6e8e994c399d573bf829b43ef04efb6d1a67