Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 8 Mar 2017 19:36:06 +0000 (20:36 +0100)
committerMirio <opivy@hotmail.de>
Wed, 8 Mar 2017 19:36:06 +0000 (20:36 +0100)
commit063b76ea9f14637c487b6d65441219df126c4b89
treebd797be8cade5a4a4fee25a3c29a7c76cda6a33d
parent93264b76294a9eed9f3c1a9a15afaf62bd06c8dc
parent3b222cad486c6df7093128c76c2075f4bb55dd07
Merge branch 'master' into Mirio/geoplanetary