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

Trivial merge