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

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

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

Visibility: public

Requested revision: eb3726c502e92ec4a3689732a76479c6d561cff5

Requested commit: eb3726c502e92ec4a3689732a76479c6d561cff5

Commit: eb3726c502e92ec4a3689732a76479c6d561cff5

Tree: 91f14deeaffd5e475c11be3ec8572b66a3799b37

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm6

```

## Parents

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

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

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