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

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

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

Visibility: public

Requested revision: cb042c8343eb94a8d149fe1f5d69aa2746aa85d0

Requested commit: cb042c8343eb94a8d149fe1f5d69aa2746aa85d0

Commit: cb042c8343eb94a8d149fe1f5d69aa2746aa85d0

Tree: 36b9711c480b61c372c86bc47dd20a635d624d3a

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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