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

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

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

Visibility: public

Requested revision: a217c764db0a1dae539c3b243ebc329350485eb5

Requested commit: a217c764db0a1dae539c3b243ebc329350485eb5

Commit: a217c764db0a1dae539c3b243ebc329350485eb5

Tree: 3e10e675ba5830d7da3e3fe7264ce9f3b2ca17de

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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