Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 19 Jan 2016 22:28:54 +0000 (17:28 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 19 Jan 2016 22:28:54 +0000 (17:28 -0500)
commit7884789ebf08bbdb401930d45ee38be3a7f31d67
tree2ffe4d63f17fb2d3498921cb416ffee02a091243
parent33757d63a9933bdae2a0d7d3d0980a91f1783ddf
parent031c3a100d68b92342546431e791970a0207e313
Merge branch 'master' into stable