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

Trivial merge