Merge from 3:a52ac06e9fc4

Clermont-Ferrand sample files

(0) -2 +2 +10 +30 +100 tip

mercurial