Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:37:47 +0000 (00:37 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:37:47 +0000 (00:37 +0200)
commitb1c781bc35aacb98ed9966d664460289260eb1fa
treea7b2673f759cdf385c7d90961378f9c8c87896ba
parentf85e858199aafc178eadc017fd99601451776e46
parent14d35acc1b569b6330de5ae293f11dae8e5e4f8c
Merge branch 'master' into Mirio/geoplanetary