Merge branch 'master' of vcs.fsf.org:enc
authorIlias Koumoundouros <ilias.k.cs@freemail.gr>
Mon, 30 Jun 2014 04:05:47 +0000 (04:05 +0000)
committerIlias Koumoundouros <ilias.k.cs@freemail.gr>
Mon, 30 Jun 2014 04:05:47 +0000 (04:05 +0000)

Trivial merge