From: Jakob MG <jakob_mg@hotmail.com>
Date: Sat, 31 Dec 2011 11:11:18 +0000 (+0100)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.6.0~189^2~20^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=740ae0e011a0e85b08bf48a5198dad246f9435c1;p=xonotic%2Fxonotic-data.pk3dir.git

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

740ae0e011a0e85b08bf48a5198dad246f9435c1