Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 20 Apr 2016 17:12:50 +0000 (13:12 -0400)
committerZak Rogoff <zak@fsf.org>
Wed, 20 Apr 2016 17:12:50 +0000 (13:12 -0400)
commit4b6712fc2b4f331431f4795b403e76df9b664b5e
tree7751ef8e69c12ed0d72bac38b29da6e5128644eb
parente30ee83f72d9e6bb71278698b9845bb6ebadc71d
parentfe036e5947d96b026a6b8713ea51d794d8a6aee6
Merge branch 'master' into stable