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

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

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

Visibility: public

Requested revision: 96c9a9bdb3f7b10aa1ce4833bf6adb0af1c82dc9

Requested commit: 96c9a9bdb3f7b10aa1ce4833bf6adb0af1c82dc9

Commit: 96c9a9bdb3f7b10aa1ce4833bf6adb0af1c82dc9

Tree: 419c1a869db10a5d911503ea3fdf8fa1777f177a

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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