Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 08:56:03 +0000 (09:56 +0100)
committerMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 08:56:03 +0000 (09:56 +0100)
commit151bbd75bff3d46009c8c1a2135b527432ead5b1
treedf4595b386c8836cdca6229a153e20fbbb244246
parent2997d467aed3a87bda24a93d73d341ccb923cd34
parent5d2f74541c9117d27ff4aeef8f1b6a49ca1b107a
Merge branch 'master' into Mirio/geoplanetary