Merge branch 'master' of vcs.fsf.org:enc
authorJuan M.G. Salcines <jmgsalcines@mykolab.com>
Wed, 9 Jul 2014 18:38:26 +0000 (20:38 +0200)
committerJuan M.G. Salcines <jmgsalcines@mykolab.com>
Wed, 9 Jul 2014 18:38:26 +0000 (20:38 +0200)
commit5d17f90ddbec6e98997688031cd3a9ce0dee6369
treeee7b5fd189b6a7c22a29e2d96cc8511804313466
parent5c97553c4689b26a113fa54854af0482b31e076e
parent8f538927be80ecf04445f6186e2764596c2f4466
Merge branch 'master' of vcs.fsf.org:enc