Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 8 Mar 2017 15:40:45 +0000 (16:40 +0100)
committerMirio <opivy@hotmail.de>
Wed, 8 Mar 2017 15:40:45 +0000 (16:40 +0100)
commitd7b6bddb29c3d10b8b36e6509718c0c954d661cc
tree1462ba8e957a4bb8271824b17a1bda0fc3e6ad70
parentb1c781bc35aacb98ed9966d664460289260eb1fa
parentbc4fb310398c33ca18c3cdbd84e938d28c404f75
Merge branch 'master' into Mirio/geoplanetary