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

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

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

Visibility: public

Requested revision: ba5eeea1e55ab07f7848890209001657df3a1cf0

Requested commit: ba5eeea1e55ab07f7848890209001657df3a1cf0

Commit: ba5eeea1e55ab07f7848890209001657df3a1cf0

Tree: 8239cdd81c7e8831b23dc00eb8bec06440d47d0e

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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