Merge branch 'master' into maddin/map-warfare
authorMirio <opivy@hotmail.de>
Mon, 6 Apr 2015 16:42:03 +0000 (18:42 +0200)
committerMirio <opivy@hotmail.de>
Mon, 6 Apr 2015 16:42:03 +0000 (18:42 +0200)

Trivial merge