Merge branch 'master' into mirio/mapfixes
authorMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 23:20:42 +0000 (00:20 +0100)
committerMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 23:20:42 +0000 (00:20 +0100)
commitaf7ea5d520886df5102c003215134f8b0012751b
tree0e9130b13735c70459a3409c95a7a6408d6c9791
parentb71f6b2809ad38f8990dc3791479e9745ac47756
parent1a1250b5c2e2353864a121f3b98f3eface0faa54
Merge branch 'master' into mirio/mapfixes