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

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

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

Visibility: public

Requested revision: 5a8d87f5042b5ab86de7c72df4ce84a314878e40

Requested commit: 5a8d87f5042b5ab86de7c72df4ce84a314878e40

Commit: 5a8d87f5042b5ab86de7c72df4ce84a314878e40

Tree: d9a8e14011994c5ebdf4525ea5c5b647aae91a6e

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm6

```

## Parents

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

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

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