Merge branch 'master' of git.unicaen.fr:lib/unicaen/ksup