From: terencehill <piuntn@gmail.com>
Date: Tue, 29 Nov 2011 18:11:19 +0000 (+0100)
Subject: Fix merge conflict
X-Git-Tag: xonotic-v0.6.0~42^2~8^2
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0b1b5021f6f2049b4d2d9187d5eb04c9af6d441d;hp=0b1b5021f6f2049b4d2d9187d5eb04c9af6d441d

Fix merge conflict
---