]> git.lizzy.rs Git - rust.git/commitdiff
Merge remote-tracking branch 'rust-lang/master' into compiletest-json
authorJonathan Turner <jturner@mozilla.com>
Fri, 22 Apr 2016 15:05:58 +0000 (08:05 -0700)
committerJonathan Turner <jturner@mozilla.com>
Fri, 22 Apr 2016 15:05:58 +0000 (08:05 -0700)

Trivial merge