Merge branch 'master' of vcs.fsf.org:enc
authorlucastx <lucas@lucasteixeira.com>
Fri, 20 Jun 2014 20:55:26 +0000 (17:55 -0300)
committerlucastx <lucas@lucasteixeira.com>
Fri, 20 Jun 2014 20:55:26 +0000 (17:55 -0300)

Trivial merge