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)
commitcb8c0a4b0b95eac5cb2997b7ace8303ad8b06c19
tree3f78910220dc6a62680c4a7e9d13d15ebc61dcc2
parent9babefb413b8fa663d58f6c40039aa71fdcd36a5
parent1a84cfec4233006db5e97af47564f9a385f52705
Merge branch 'master' of vcs.fsf.org:enc