# Merge branch 'master' into llvm6 · gitcafe/zig

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

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

Visibility: public

Requested revision: 6bfaf262d5a1d18482a813c7022ffb03a18f52a8

Requested commit: 6bfaf262d5a1d18482a813c7022ffb03a18f52a8

Commit: 6bfaf262d5a1d18482a813c7022ffb03a18f52a8

Tree: 7f432e8f386aed17df3f1bccdff34ec58b3ff2af

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm6

```

## Parents

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

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

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