Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 8 Dec 2016 16:51:58 +0000 (11:51 -0500)
committerZak Rogoff <zak@fsf.org>
Thu, 8 Dec 2016 16:51:58 +0000 (11:51 -0500)
commitfc88f8dc4de7595f802ec0295fa8528accd7b0af
tree1313a4c468c0089575c25d8db7530390e9fb3b42
parentcfeb6d5720697546e6720031dc010a017ad8e926
parent8453d2b8e3dd43c45d9cae9cf80d2f8772fbf9fd
Merge branch 'master' into stable