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

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

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

Visibility: public

Requested revision: a0e89c9b46fc91d9b1dfebd02eaae233802e3cbc

Requested commit: a0e89c9b46fc91d9b1dfebd02eaae233802e3cbc

Commit: a0e89c9b46fc91d9b1dfebd02eaae233802e3cbc

Tree: 6a1ee37f130b4cb69204158ff915ecc2c6bb002b

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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