Merge branch 'master' of vcs.fsf.org:enc-static
authorraffael <rr@fsfe.org>
Sun, 13 Jul 2014 12:14:53 +0000 (14:14 +0200)
committerraffael <rr@fsfe.org>
Sun, 13 Jul 2014 12:14:53 +0000 (14:14 +0200)

Trivial merge