Merge branch 'master' of vcs.fsf.org:enc-static
authorraffael <rr@fsfe.org>
Wed, 25 Jun 2014 21:40:59 +0000 (23:40 +0200)
committerraffael <rr@fsfe.org>
Wed, 25 Jun 2014 21:40:59 +0000 (23:40 +0200)

Trivial merge