From: Mirio <opivy@hotmail.de>
Date: Fri, 15 Jan 2016 15:42:20 +0000 (+0100)
Subject: Merge branch 'master' into mirio/fuse
X-Git-Tag: xonotic-v0.8.2~105^2~3
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=7abfe15492d6bb6fc8a0aa87db8183ef6b55e636;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into mirio/fuse
---

7abfe15492d6bb6fc8a0aa87db8183ef6b55e636