Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 21:36:47 +0000 (22:36 +0100)
committerMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 21:36:47 +0000 (22:36 +0100)
commitc52527c7858cabf9d935963d7784305f83842e30
tree203681027e08cd6b316731b5ceb93229a5d1b740
parent74a312ee61b2828761351562039b1908fd3d93d9
parentecde0084439fd728185564cb7b3d1b9b50ec9c71
Merge branch 'master' into mirio/geoplanetary