Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 29 Nov 2016 21:50:59 +0000 (16:50 -0500)
committerZak Rogoff <zak@fsf.org>
Tue, 29 Nov 2016 21:50:59 +0000 (16:50 -0500)
commitc2ac9b23bbd46a29f8718c8fc9d0e75a52bcfd86
tree5f2e9f61ab3731b62c02f860c35397a3dafad511
parent30bf5638b707c835d977b8edb11ef2f80c4e5e6d
parentfe707ec51be24d021691676b27162322a3152f34
Merge branch 'master' into stable