Merge branch 'master' of vcs.fsf.org:enc
authorJuan Jose Olivera <juan@genso.com.bo>
Mon, 7 Jul 2014 13:08:57 +0000 (09:08 -0400)
committerJuan Jose Olivera <juan@genso.com.bo>
Mon, 7 Jul 2014 13:08:57 +0000 (09:08 -0400)

Trivial merge