From: Mirio <opivy@hotmail.de>
Date: Fri, 23 Jan 2015 19:15:20 +0000 (+0100)
Subject: Merge branch 'master' into mirio/geoplanetary
X-Git-Tag: xonotic-v0.8.2~79^2~32
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=b86207cf19e2f823919e8b0642a2646c02c9cf25

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

b86207cf19e2f823919e8b0642a2646c02c9cf25