Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 20 Apr 2016 17:15:13 +0000 (13:15 -0400)
committerZak Rogoff <zak@fsf.org>
Wed, 20 Apr 2016 17:15:13 +0000 (13:15 -0400)
commit61f303b0e54809347b1a26042e2ff6108458af9e
tree129879e1581709b59d0e210c841f54809c738744
parent4b6712fc2b4f331431f4795b403e76df9b664b5e
parent148ac5bae70a274c2c87ff23a440395f70334c6d
Merge branch 'master' into stable