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

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

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

Visibility: public

Requested revision: 9cfd7dea19c4c54e2754119c04c06cd57cfb759d

Requested commit: 9cfd7dea19c4c54e2754119c04c06cd57cfb759d

Commit: 9cfd7dea19c4c54e2754119c04c06cd57cfb759d

Tree: 3b7950d86f77467b43aa323f80563f678cf6d2fb

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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