Merge branch 'master' of github.com:maieul/ledmac
Merge branch 'master' into compteur