From: Mirio <opivy@hotmail.de>
Date: Tue, 17 Jun 2014 14:22:04 +0000 (+0200)
Subject: Merge branch 'master' into mirio/map_updates
X-Git-Tag: xonotic-v0.8.0~20^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79eb719058507fbaf42ce231719f0035829574bc;p=xonotic%2Fxonotic-maps.pk3dir.git

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

79eb719058507fbaf42ce231719f0035829574bc