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

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

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

Visibility: public

Requested revision: 8b716f941dbd43936a994a008aec9cd21d0b08f2

Requested commit: 8b716f941dbd43936a994a008aec9cd21d0b08f2

Commit: 8b716f941dbd43936a994a008aec9cd21d0b08f2

Tree: c9ad8a52ffeb52b9b7ca412b806d7c0b6213d6af

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm6

```

## Parents

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

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

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