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

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

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

Visibility: public

Requested revision: d1d3dbc7b5bc986849db476e491300ffd18d4db5

Requested commit: d1d3dbc7b5bc986849db476e491300ffd18d4db5

Commit: d1d3dbc7b5bc986849db476e491300ffd18d4db5

Tree: 8ab3bb2b5b8a82edf18caca6e28dc8e74ab81d11

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm6

```

## Parents

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

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

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