Merge branch 'master' of vcs.fsf.org:enc
authorLucas Teixeira <lucas@lucasteixeira.com>
Tue, 24 Jun 2014 15:20:39 +0000 (12:20 -0300)
committerLucas Teixeira <lucas@lucasteixeira.com>
Tue, 24 Jun 2014 15:20:39 +0000 (12:20 -0300)

Trivial merge