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)
commit44e11a5813216682386f3ff53ae03faf1832e2c6
tree8bfd85ae19de08cd35a2b77a3cf6cb1b8a16c09a
parent3713b9e55fa0c388b930e25fc9ed42d0c63c32bc
parentc2cc55b1bd74f3427ec2644abb3b42caeff40221
Merge branch 'master' of vcs.fsf.org:enc