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

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

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

Visibility: public

Requested revision: 1c244d34b3c80149b83ce974b1c81e66890ed123

Requested commit: 1c244d34b3c80149b83ce974b1c81e66890ed123

Commit: 1c244d34b3c80149b83ce974b1c81e66890ed123

Tree: 57bcdfb54a8c126d2ede9c08ebecc0d1aa4fed79

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm6

```

## Parents

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

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

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