Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 24 May 2016 19:17:58 +0000 (15:17 -0400)
committerZak Rogoff <zak@fsf.org>
Tue, 24 May 2016 19:17:58 +0000 (15:17 -0400)
commit8b1ebd9c9fb98fc2f5982160e55e0d6533b3245d
tree63ce9d0b5c0ceb86aba3aec21b35d1e531e4a55b
parent15a9221cbf07d38d23cd7212e841fb0e3cfdfc0a
parent4d9f975f5d78b7c45f419a873436c9b901c153f7
Merge branch 'master' into stable