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

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

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

Visibility: public

Requested revision: a4316d5505d3af1e868a3506787f31a9ae90085a

Requested commit: a4316d5505d3af1e868a3506787f31a9ae90085a

Commit: a4316d5505d3af1e868a3506787f31a9ae90085a

Tree: 197b3e2b3da083de2494c85a29fbf938f314fba9

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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