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

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

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

Visibility: public

Requested revision: 52b8239a22aa37fe3914427cd4e2905231769e59

Requested commit: 52b8239a22aa37fe3914427cd4e2905231769e59

Commit: 52b8239a22aa37fe3914427cd4e2905231769e59

Tree: cd60ca825c14b5befbcddf674bdb7d3feda81d23

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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