tree 00a15a1d60f9c68929d768ea94f3f32420caaf8b
parent e3539334f042f2b5b89a59aeb15204f31b5e791f
parent 609ae53e9287ac1afbf04d8544da692cb08a5209
author Alex Crichton <alex@alexcrichton.com> 1467568528 -0700
committer GitHub <noreply@github.com> 1467568528 -0700

Merge pull request #34635 from alexcrichton/beta-next

Last minute backports to beta