Merge branch 'master' of vcs.fsf.org:enc
authorIlias Koumoundouros <ilias.k.cs@freemail.gr>
Sun, 6 Jul 2014 19:56:39 +0000 (22:56 +0300)
committerIlias Koumoundouros <ilias.k.cs@freemail.gr>
Sun, 6 Jul 2014 19:56:39 +0000 (22:56 +0300)

Trivial merge