Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 26 May 2016 14:33:51 +0000 (10:33 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 26 May 2016 14:33:51 +0000 (10:33 -0400)
commitddc70035e39b0fb60ebd0b86b8cebffcdcd3fc73
tree92686b76c1bc1cd517dca2d3f230d656db1d51b1
parent8b1ebd9c9fb98fc2f5982160e55e0d6533b3245d
parent196cd083675a29a5f79d5a5630fcb977d719b3ae
Merge branch 'master' into stable