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)

Trivial merge