From: Jakob MG <jakob_mg@hotmail.com>
Date: Sun, 17 Jun 2012 11:26:07 +0000 (+0200)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.7.0~312^2~21
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=42df301d6e114c923c5e5d0e3059de91b4666bb7;p=xonotic%2Fxonotic-data.pk3dir.git

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

42df301d6e114c923c5e5d0e3059de91b4666bb7