Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 00:16:21 +0000 (01:16 +0100)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 00:16:21 +0000 (01:16 +0100)
commit3f9b92f8b478fb2da0ff725aefcb044258e6435b
treecd82fcc6ff8dd11818687af3868f42b083669b93
parentbe8b31bcb8887959ad0c6e29daca1042c0a73b0d
parentcab778c371fe21e6a422fd6a53323d34d3d22146
Merge branch 'master' into Mirio/geoplanetary