Merge branch 'master' of vcs.fsf.org:enc
authorThiago Marinello <marinello@acm.org>
Mon, 23 Jun 2014 22:23:48 +0000 (19:23 -0300)
committerThiago Marinello <marinello@acm.org>
Mon, 23 Jun 2014 22:23:48 +0000 (19:23 -0300)

Trivial merge