Merge branch 'master' of vcs.fsf.org:enc
authorIlias Koumoundouros <ilias.k.cs@freemail.gr>
Sat, 28 Jun 2014 08:15:11 +0000 (08:15 +0000)
committerIlias Koumoundouros <ilias.k.cs@freemail.gr>
Sat, 28 Jun 2014 08:15:11 +0000 (08:15 +0000)

Trivial merge