Merge branch 'master' into maddin/map-warfare
authorMirio <opivy@hotmail.de>
Wed, 11 Feb 2015 12:37:24 +0000 (13:37 +0100)
committerMirio <opivy@hotmail.de>
Wed, 11 Feb 2015 12:37:24 +0000 (13:37 +0100)

Trivial merge