Merge branch 'master' of vcs.fsf.org:enc
authorLucas Teixeira <lucas@lucasteixeira.com>
Fri, 22 Aug 2014 18:39:07 +0000 (15:39 -0300)
committerLucas Teixeira <lucas@lucasteixeira.com>
Fri, 22 Aug 2014 18:39:07 +0000 (15:39 -0300)

Trivial merge