Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Thu, 9 Jul 2015 19:10:52 +0000 (21:10 +0200)
committerMirio <opivy@hotmail.de>
Thu, 9 Jul 2015 19:10:52 +0000 (21:10 +0200)
commit5705046d6758f73d6aa4798c70afa3ef73363ea0
tree758af884296f80ee10b1f5a6c8cc64ecb18d7dde
parente9499748224767be01908c950e279aa5ab044813
parent48c944b8b62976ffb79b566f40dae12f161bc28c
Merge branch 'master' into mirio/geoplanetary