From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 13 Oct 2011 23:33:41 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.6.0~40^2~30^2~4
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=e34ae91691fbc4e32fa550dd0b6ad3d10c50e865;p=xonotic%2Fxonotic-data.pk3dir.git

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

e34ae91691fbc4e32fa550dd0b6ad3d10c50e865