Merge branch 'maddin/map-warfare'
authorMirio <opivy@hotmail.de>
Thu, 9 Jul 2015 19:04:04 +0000 (21:04 +0200)
committerMirio <opivy@hotmail.de>
Thu, 9 Jul 2015 19:04:04 +0000 (21:04 +0200)

Trivial merge