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

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

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

Visibility: public

Requested revision: a6bf37f8ca5a2eabc7cacb22696d2a2c622a993d

Requested commit: a6bf37f8ca5a2eabc7cacb22696d2a2c622a993d

Commit: a6bf37f8ca5a2eabc7cacb22696d2a2c622a993d

Tree: 615f02861d70bc18bb210e3435d685f6e6c808ec

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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