Merge branch 'master' into Mirio/geoplanetary 67/head
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:24:42 +0000 (21:24 +0100)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:24:42 +0000 (21:24 +0100)
commitc50b2e0373ece7d78ce01ad9186d8bff462fc733
tree35ad4fd86a0e1f129431cd9143c06b62dbf53df7
parentbaf8fe20cddc0aeae390e7d81e622efb0b5e3906
parent8865b7783c8bb0fb2c85d674ee00814acf42d5bb
Merge branch 'master' into Mirio/geoplanetary