Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 3 Dec 2014 23:06:00 +0000 (00:06 +0100)
committerMirio <opivy@hotmail.de>
Wed, 3 Dec 2014 23:06:00 +0000 (00:06 +0100)
commit20328628e1d2d323ec493324facc6c3e2758babc
tree262b1279f357eacb29a5f7e2a693742c5d543460
parent4c5d74b7af9cdff9f2c61ce331e074dcf1e14e5b
parent8977c1928dccbf4567088b2efd3171260ca9162a
Merge branch 'master' into mirio/geoplanetary