From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 10 Jul 2012 09:41:04 +0000 (+0200)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.7.0~111^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff673f98fabba69b6ce6a32e627534a8895bef21;p=xonotic%2Fxonotic-data.pk3dir.git

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

ff673f98fabba69b6ce6a32e627534a8895bef21