Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Tue, 27 Oct 2015 10:09:00 +0000 (11:09 +0100)
committerMirio <opivy@hotmail.de>
Tue, 27 Oct 2015 10:09:00 +0000 (11:09 +0100)
commit2997d467aed3a87bda24a93d73d341ccb923cd34
treef3c325d7ae5faa9756baa321a6cfdaf4b5376564
parent21dae6d774b04057c93d1acdb9db5bff05b3ce38
parent52e32439febfcc5f78f5e0eeeacbb22f83c4c3b3
Merge branch 'master' into mirio/geoplanetary