Merge branch 'master' of vcs.fsf.org:enc-static
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Mon, 16 Jun 2014 19:16:03 +0000 (20:16 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Mon, 16 Jun 2014 19:16:03 +0000 (20:16 +0100)

Trivial merge