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

Trivial merge