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

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

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

Visibility: public

Requested revision: f804310d9f953c9d78a4271ba8d75133341840e6

Requested commit: f804310d9f953c9d78a4271ba8d75133341840e6

Commit: f804310d9f953c9d78a4271ba8d75133341840e6

Tree: 71a9db15bcabbec32d6f2c795927603f9b278ceb

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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