From: MaidenBeast <fel.sallustio@gmail.com>
Date: Tue, 12 Jul 2011 18:49:21 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.5.0~148^2~25^2~5^2~4
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=d28bb718bfd02ac65b80e6160d829a2b5f2edc4d;p=xonotic%2Fxonotic-data.pk3dir.git

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

d28bb718bfd02ac65b80e6160d829a2b5f2edc4d