Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Thu, 11 Jun 2015 11:21:45 +0000 (13:21 +0200)
committerMirio <opivy@hotmail.de>
Thu, 11 Jun 2015 11:21:45 +0000 (13:21 +0200)
commite9499748224767be01908c950e279aa5ab044813
tree9889dcf2faa3e99829c8503605963c704cdfcfab
parent0cba88f20df5807bd56099b84f042e9ebd6b9a30
parenta861a697fd92501487c9a3edf588cfa6a6a83182
Merge branch 'master' into mirio/geoplanetary