Merge branch 'master' of vcs.fsf.org:enc
authorJuan M.G. Salcines <jmgsalcines@mykolab.com>
Sat, 12 Jul 2014 20:33:27 +0000 (22:33 +0200)
committerJuan M.G. Salcines <jmgsalcines@mykolab.com>
Sat, 12 Jul 2014 20:33:27 +0000 (22:33 +0200)

Trivial merge