Merge branch 'master' of vcs.fsf.org:enc
authorTomas <tomasn@kth.se>
Thu, 10 Mar 2016 21:52:14 +0000 (22:52 +0100)
committerTomas <tomasn@kth.se>
Thu, 10 Mar 2016 21:52:14 +0000 (22:52 +0100)

Trivial merge