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

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

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

Visibility: public

Requested revision: 371e578151b1bc402d766ace161cfb4e06777db6

Requested commit: 371e578151b1bc402d766ace161cfb4e06777db6

Commit: 371e578151b1bc402d766ace161cfb4e06777db6

Tree: 662f1d4ca878e55df3de297ade566057109093f7

Author: Ryan Saunderson

Committer: Ryan Saunderson

## Message

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

```

## Parents

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

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

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