From: Mirio <opivy@hotmail.de>
Date: Tue, 7 Mar 2017 12:37:12 +0000 (+0100)
Subject: merge conflict
X-Git-Tag: xonotic-v0.8.2~78^2~12
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=0908b1c6a711ee325908c82333ec9c08a2e61a03;hp=0908b1c6a711ee325908c82333ec9c08a2e61a03

merge conflict
---