Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Thu, 20 Aug 2015 07:07:24 +0000 (09:07 +0200)
committerMirio <opivy@hotmail.de>
Thu, 20 Aug 2015 07:07:24 +0000 (09:07 +0200)
commit4edea52693db1165366d4cda7741bb974114edcc
treede1488d1d627adb8fcd166ea576e4aca052dd5ff
parent5705046d6758f73d6aa4798c70afa3ef73363ea0
parentd52e81c2caef88f7bf1db069562e34be7c7833b8
Merge branch 'master' into mirio/geoplanetary