Merge branch 'next-version' of vcs.fsf.org:enc into next-version
authorZak Rogoff <zak@fsf.org>
Fri, 15 Jan 2016 23:32:36 +0000 (18:32 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 15 Jan 2016 23:32:36 +0000 (18:32 -0500)
commit291f5348764ec834c2082b2f6048c4ca1fdbd178
treedcf6243c94878513ec4ece8a2f52883b15bcf81d
parent02e5b8a74b108a5c8cdcdbd06f305271d82040cd
parentf1cdd08f50f3ed405844849380a3fc2c164b6b4a
Merge branch 'next-version' of vcs.fsf.org:enc into next-version