Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:10:17 +0000 (18:10 +0100)
committerMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:10:17 +0000 (18:10 +0100)
commitf85e858199aafc178eadc017fd99601451776e46
tree38005b49659cea2b9828768ef5f3f92cc15d9a77
parent151bbd75bff3d46009c8c1a2135b527432ead5b1
parent64c85aedb50c19f5c39f1456101b738f9cbcf33e
Merge branch 'master' into mirio/geoplanetary