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

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

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

Visibility: public

Requested revision: 38658a597bc22697c2038c21bdec9f04c9973eb8

Requested commit: 38658a597bc22697c2038c21bdec9f04c9973eb8

Commit: 38658a597bc22697c2038c21bdec9f04c9973eb8

Tree: 4f52ec6d34bf1380750fcdb37c99e8b5d05c1762

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm6

```

## Parents

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

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

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