Merge pull request rust-lang#23 from rust-lang/master

Sync to rust-lang/rust branch master
Centril · Sep 20, 2019 · 66b1649 · 66b1649
2 parents 83e7976 + 9ad1e7c
commit 66b1649
Show file tree

Hide file tree

Showing 1,185 changed files with 17,730 additions and 12,334 deletions.
diff --git a/.mailmap b/.mailmap
@@ -184,6 +184,7 @@ Neil Pankey <[email protected]> <[email protected]>
 Nick Platt <[email protected]>
 Nicole Mazzuca <[email protected]>
 Nif Ward <[email protected]>
+Oliver Middleton <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>