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

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

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

Visibility: public

Requested revision: 036a49e97d0bc556ece08562c9dd3c75879598cf

Requested commit: 036a49e97d0bc556ece08562c9dd3c75879598cf

Commit: 036a49e97d0bc556ece08562c9dd3c75879598cf

Tree: 9707943a5c063fe196bd091b801c5c626f3f0eb8

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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