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

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

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

Visibility: public

Requested revision: a984040faecab4fed4fc5e36e44d5ec352b7a098

Requested commit: a984040faecab4fed4fc5e36e44d5ec352b7a098

Commit: a984040faecab4fed4fc5e36e44d5ec352b7a098

Tree: 1f86151c1381dd580d1e3061e32bc9a36515e61f

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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