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

Trivial merge