Merge branch 'master' of vcs.fsf.org:enc-static
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 09:06:51 +0000 (10:06 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 09:06:51 +0000 (10:06 +0100)

Trivial merge