Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Mon, 16 Mar 2015 14:18:18 +0000 (15:18 +0100)
committerMirio <opivy@hotmail.de>
Mon, 16 Mar 2015 14:18:18 +0000 (15:18 +0100)
commitb4630e57c10a60544cd2cd0d9fe714319eefac9f
treec9821bcd5bcf13d1a1d246f79aa58ed5b8b64813
parentc52527c7858cabf9d935963d7784305f83842e30
parent2397776b501c5d6bd943f5d4755b2a72c5fb0112
Merge branch 'master' into mirio/geoplanetary