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

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

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

Visibility: public

Requested revision: 42004f9013ba2d06b457f858e0e269ef4ad23554

Requested commit: 42004f9013ba2d06b457f858e0e269ef4ad23554

Commit: 42004f9013ba2d06b457f858e0e269ef4ad23554

Tree: ee99dd89c9ce7e7c30a76e7bf0d9f7da7c0c64c7

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm6

```

## Parents

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

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

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