Merge branch 'master' of vcs.fsf.org:enc
authorLucas Teixeira <lucas@lucasteixeira.com>
Mon, 23 Jun 2014 23:18:33 +0000 (20:18 -0300)
committerLucas Teixeira <lucas@lucasteixeira.com>
Mon, 23 Jun 2014 23:18:33 +0000 (20:18 -0300)

Trivial merge