Merge branch 'master' into maddin/map-warfare-updates
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:29:23 +0000 (00:29 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:29:23 +0000 (00:29 +0200)
1  2 
maps/warfare.map

Simple merge