Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Sat, 5 Sep 2015 12:57:07 +0000 (14:57 +0200)
committerMirio <opivy@hotmail.de>
Sat, 5 Sep 2015 12:57:07 +0000 (14:57 +0200)
commit21dae6d774b04057c93d1acdb9db5bff05b3ce38
tree6182bab1ac50a5ce418ccbada2b5d20ce0b56b20
parentce1989ebcbd4d4f44b8ca07162e89345f3e398a8
parent5192026c2ac9b39e7bd4bb2e8cec4b6efc16df3e
Merge branch 'master' into Mirio/geoplanetary