Merge branch 'Mirio/mapinfos'
authorMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 00:41:39 +0000 (01:41 +0100)
committerMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 00:41:39 +0000 (01:41 +0100)

Trivial merge