Merge branch 'master' of vcs.fsf.org:enc
authortomnor <tomasn@kth.se>
Mon, 8 Feb 2016 21:59:42 +0000 (22:59 +0100)
committertomnor <tomasn@kth.se>
Mon, 8 Feb 2016 21:59:42 +0000 (22:59 +0100)

Trivial merge