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

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

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

Visibility: public

Requested revision: 8eae4a096752b7e477d16ee0c5fd40d8871e973a

Requested commit: 8eae4a096752b7e477d16ee0c5fd40d8871e973a

Commit: 8eae4a096752b7e477d16ee0c5fd40d8871e973a

Tree: 3cdbfaeb3c53eaf551ab59bd508edbb4c2bddc5d

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm6

```

## Parents

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

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

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