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

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

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

Visibility: public

Requested revision: 9e8943736e34d28d1ea62229d6ca708303cd0eba

Requested commit: 9e8943736e34d28d1ea62229d6ca708303cd0eba

Commit: 9e8943736e34d28d1ea62229d6ca708303cd0eba

Tree: 878057b9513b6801a19e60ab47aa923f575fbb27

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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