essai de Spring Java Config pour Spring Batch
...
Merge branch 'master' of https://github.com/fanfansama/difea

Conflicts:

difea-batch/src/main/java/eu/esma/difea/batch/tasklet/sample/PopulateDif
eaTasklet.java