From: MaidenBeast <fel.sallustio@gmail.com>
Date: Wed, 27 Jul 2011 18:35:46 +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~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e8052009f7025c503b52c64a29010d9999da368;p=xonotic%2Fxonotic-data.pk3dir.git

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

0e8052009f7025c503b52c64a29010d9999da368