Merge branch 'master' of vcs.fsf.org:enc
authorraffael <rr@fsfe.org>
Mon, 17 Nov 2014 21:37:49 +0000 (22:37 +0100)
committerraffael <rr@fsfe.org>
Mon, 17 Nov 2014 21:37:49 +0000 (22:37 +0100)

Trivial merge