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

Trivial merge