Merge branch 'master' of vcs.fsf.org:enc
authorlucastx <lucas@lucasteixeira.com>
Thu, 19 Jun 2014 22:02:07 +0000 (19:02 -0300)
committerlucastx <lucas@lucasteixeira.com>
Thu, 19 Jun 2014 22:02:07 +0000 (19:02 -0300)

Trivial merge