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)
commitd459f72db2d7e9cf92d9f7d9094fcf5fa1d1f161
tree40401ed1aabfb6e9c11ca2d7e1b82ae9d8b4d3d4
parent3f22734ff2ea933896e450d778b5d3a190e2b8d9
parentd9fd85d39f382e8b1effbdbfced44437f1c9b070
Merge branch 'master' of vcs.fsf.org:enc