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

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

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

Visibility: public

Requested revision: 96c07674fc2293fa040212ab797c05436dc515b1

Requested commit: 96c07674fc2293fa040212ab797c05436dc515b1

Commit: 96c07674fc2293fa040212ab797c05436dc515b1

Tree: 67b0bc649f4b4c384259a031269254a90078c0bd

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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