From: Jakob MG <jakob_mg@hotmail.com>
Date: Mon, 11 Jun 2012 10:44:42 +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~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9bd5f79a7f15e4a8abed066f476ff3fed34c0fa2;p=xonotic%2Fxonotic-data.pk3dir.git

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

9bd5f79a7f15e4a8abed066f476ff3fed34c0fa2