From: Mirio <opivy@hotmail.de>
Date: Mon, 16 Jan 2017 16:57:23 +0000 (+0100)
Subject: Merge branch 'master' into kuniuthefrogg/boil
X-Git-Tag: xonotic-v0.8.2~102^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb7f8f41adea9fc2c1a2c57d0d8bd1500e805134;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into kuniuthefrogg/boil
---

cb7f8f41adea9fc2c1a2c57d0d8bd1500e805134