Merge branch 'master' of vcs.fsf.org:enc
authorIlias Koumoundouros <ilias.k.cs@freemail.gr>
Mon, 21 Jul 2014 23:38:42 +0000 (02:38 +0300)
committerIlias Koumoundouros <ilias.k.cs@freemail.gr>
Mon, 21 Jul 2014 23:38:42 +0000 (02:38 +0300)

Trivial merge