Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Mon, 6 Apr 2015 16:40:22 +0000 (18:40 +0200)
committerMirio <opivy@hotmail.de>
Mon, 6 Apr 2015 16:40:22 +0000 (18:40 +0200)
commite1d29af9903234c7fb6900b57cd5b1281d48977d
tree995ba3f7840a7e6d9a3f2c3798002ef37d9ea044
parentb4630e57c10a60544cd2cd0d9fe714319eefac9f
parent80b29c98079cd8706d09789af8c4d0e77f760e1f
Merge branch 'master' into mirio/geoplanetary