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

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

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

Visibility: public

Requested revision: 4d920cee6e8be2f2ae2cfd9067358c65b977568a

Requested commit: 4d920cee6e8be2f2ae2cfd9067358c65b977568a

Commit: 4d920cee6e8be2f2ae2cfd9067358c65b977568a

Tree: 2c04de6151b7448dec9958d0a91234ea0ba9a15d

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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