Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Mon, 31 Aug 2015 11:56:51 +0000 (13:56 +0200)
committerMirio <opivy@hotmail.de>
Mon, 31 Aug 2015 11:56:51 +0000 (13:56 +0200)
commitce1989ebcbd4d4f44b8ca07162e89345f3e398a8
treeb2eafe0c81466a82a34600ee85567b529f42555e
parent4edea52693db1165366d4cda7741bb974114edcc
parentb9cc27af323228bc65160dbbddb031739909ac58
Merge branch 'master' into mirio/geoplanetary