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

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

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

Visibility: public

Requested revision: 558b0b87913dfb6e6b76f5dbe2c36b920302faab

Requested commit: 558b0b87913dfb6e6b76f5dbe2c36b920302faab

Commit: 558b0b87913dfb6e6b76f5dbe2c36b920302faab

Tree: 40153dfe995f127577db5e277cbec618aff2c30e

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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