Merge branch 'master' of git://git.auf.org/auf_savoirs_en_partage_django