Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Fri, 23 Jan 2015 19:15:20 +0000 (20:15 +0100)
committerMirio <opivy@hotmail.de>
Fri, 23 Jan 2015 19:15:20 +0000 (20:15 +0100)
commitb86207cf19e2f823919e8b0642a2646c02c9cf25
tree599ab4f4fd626fb68d242d4ee4d10b5831210adf
parent080c903773d8978244269ae50c0900bbedc5ab03
parent208ff8cecfd188d3b8b7b9203a216dae9256f622
Merge branch 'master' into mirio/geoplanetary