Merge branch 'master' of vcs.fsf.org:enc-static
authorIlias Koumoundouros <ilias.k.cs@freemail.gr>
Mon, 4 Aug 2014 00:46:41 +0000 (03:46 +0300)
committerIlias Koumoundouros <ilias.k.cs@freemail.gr>
Mon, 4 Aug 2014 00:46:41 +0000 (03:46 +0300)

Trivial merge