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

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

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

Visibility: public

Requested revision: b57cb04afc1898c3b21ef3486709f0c0aa285433

Requested commit: b57cb04afc1898c3b21ef3486709f0c0aa285433

Commit: b57cb04afc1898c3b21ef3486709f0c0aa285433

Tree: e234c061c28a95c35afbb35b80b89e3114ecdeb9

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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