Merge branch 'master' of vcs.fsf.org:enc
authorLucas Teixeira <lucas@lucasteixeira.com>
Thu, 21 Aug 2014 22:17:39 +0000 (19:17 -0300)
committerLucas Teixeira <lucas@lucasteixeira.com>
Thu, 21 Aug 2014 22:17:39 +0000 (19:17 -0300)

Trivial merge