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

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

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

Visibility: public

Requested revision: c9474faa4e6cfd6480c1bd24216c26f4320e3c29

Requested commit: c9474faa4e6cfd6480c1bd24216c26f4320e3c29

Commit: c9474faa4e6cfd6480c1bd24216c26f4320e3c29

Tree: 4bf022698f229cd276b598ed95aa30a61e882674

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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