From: Jakob MG <jakob_mg@hotmail.com>
Date: Sat, 22 Sep 2012 08:53:05 +0000 (+0200)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.7.0~218^2~1^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f66262ee900f3db4c68d5632fe1bc598cd371edf;p=xonotic%2Fxonotic-data.pk3dir.git

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

f66262ee900f3db4c68d5632fe1bc598cd371edf