Merge branch 'master' of vcs.fsf.org:enc
authorIlias Koumoundouros <ilias.k.cs@freemail.gr>
Sun, 29 Jun 2014 12:59:49 +0000 (12:59 +0000)
committerIlias Koumoundouros <ilias.k.cs@freemail.gr>
Sun, 29 Jun 2014 12:59:49 +0000 (12:59 +0000)

Trivial merge