Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Wed, 19 Aug 2015 18:45:51 +0000 (14:45 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Wed, 19 Aug 2015 18:45:51 +0000 (14:45 -0400)
commit7e12140805c8440e05306e061438020cb17e4691
tree554f29a49837b3603f07159e52685032670671dc
parent127272760e95179969f02256a35e2e7dcc12ddd6
parent0d7c9954757d41dc75a98a434d1ad4e6fa327e0a
Merge branch 'master' of vcs.fsf.org:enc