Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 15 Apr 2015 23:35:54 +0000 (01:35 +0200)
committerMirio <opivy@hotmail.de>
Wed, 15 Apr 2015 23:35:54 +0000 (01:35 +0200)
commit0cba88f20df5807bd56099b84f042e9ebd6b9a30
treec289f58432d982a0386cff8238a62adb4a3ffb61
parente1d29af9903234c7fb6900b57cd5b1281d48977d
parent8599d61ae26e5d60682a2b345a398863dec05414
Merge branch 'master' into mirio/geoplanetary