From: Jakob MG <jakob_mg@hotmail.com>
Date: Wed, 23 May 2012 18:47:45 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.7.0~314^2~4
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e16c21c64c076a70c353b56f0e24b93af3eb3978

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

e16c21c64c076a70c353b56f0e24b93af3eb3978