# Merge remote-tracking branch 'origin/master' into llvm11 · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/4971400bdcc810766da15c63e3e57a59e49499ca)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: 4971400bdcc810766da15c63e3e57a59e49499ca

Requested commit: 4971400bdcc810766da15c63e3e57a59e49499ca

Commit: 4971400bdcc810766da15c63e3e57a59e49499ca

Tree: a083b906cf09fc7e43c4862fcae452c616cc2df3

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into llvm11

```

## Parents

- [96368b9f39468d727a85f9ce2729d65dd2fe3169](https://git.cafe/gitcafe/zig/commit/96368b9f39468d727a85f9ce2729d65dd2fe3169?format=markdown)

- [3e24e958922806379f9f609e36954a489eb20831](https://git.cafe/gitcafe/zig/commit/3e24e958922806379f9f609e36954a489eb20831?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/4971400bdcc810766da15c63e3e57a59e49499ca?format=markdown)