Merge branch 'master' of vcs.fsf.org:enc
authorThiago Marinello <marinello@acm.org>
Sat, 28 Jun 2014 12:40:10 +0000 (09:40 -0300)
committerThiago Marinello <marinello@acm.org>
Sat, 28 Jun 2014 12:40:10 +0000 (09:40 -0300)

Trivial merge