From: Mirio <opivy@hotmail.de>
Date: Mon, 9 Feb 2015 00:41:39 +0000 (+0100)
Subject: Merge branch 'Mirio/mapinfos'
X-Git-Tag: xonotic-v0.8.1~41
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a1250b5c2e2353864a121f3b98f3eface0faa54;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/mapinfos'
---

1a1250b5c2e2353864a121f3b98f3eface0faa54