Merge branch 'master' of vcs.fsf.org:enc
authorYassir Karroum <ukarroum17@gmail.com>
Mon, 8 Feb 2016 18:54:42 +0000 (18:54 +0000)
committerYassir Karroum <ukarroum17@gmail.com>
Mon, 8 Feb 2016 18:54:42 +0000 (18:54 +0000)

Trivial merge