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

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

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

Visibility: public

Requested revision: 1d77f8db289e6eefce827fe37d27e72b68362943

Requested commit: 1d77f8db289e6eefce827fe37d27e72b68362943

Commit: 1d77f8db289e6eefce827fe37d27e72b68362943

Tree: 62bcadb5abcf45076583c362cb68e254067020f0

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm6

```

## Parents

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

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

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