From: MaidenBeast <fel.sallustio@gmail.com>
Date: Fri, 29 Jul 2011 09:25:56 +0000 (+0200)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.5.0~148^2~25^2~5^2
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=d7a010137bb18ba896e4196140ffe8f4afb4de6c;p=xonotic%2Fxonotic-data.pk3dir.git

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

d7a010137bb18ba896e4196140ffe8f4afb4de6c