Merge branch 'master' of vcs.fsf.org:enc
authorThérèse Godefroy <godef.th@free.fr>
Sat, 21 Jun 2014 14:17:59 +0000 (16:17 +0200)
committerThérèse Godefroy <godef.th@free.fr>
Sat, 21 Jun 2014 14:17:59 +0000 (16:17 +0200)

Trivial merge