From: Jakob MG <jakob_mg@hotmail.com>
Date: Wed, 15 Aug 2012 21:08:30 +0000 (+0200)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.7.0~282
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8beef3df5c88302dcc26868584442deb671d5f1;p=xonotic%2Fxonotic-data.pk3dir.git

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

e8beef3df5c88302dcc26868584442deb671d5f1