Merge branch 'master' of vcs.fsf.org:enc
authorJuan Jose Olivera <juan@genso.com.bo>
Tue, 24 Jun 2014 18:11:10 +0000 (14:11 -0400)
committerJuan Jose Olivera <juan@genso.com.bo>
Tue, 24 Jun 2014 18:11:10 +0000 (14:11 -0400)

Trivial merge