# Merge remote-tracking branch 'origin/master' into llvm6 · gitcafe/zig

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

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

Visibility: public

Requested revision: 5d9a8cbe1a1e399284a78a2ac88bb5916f47e87a

Requested commit: 5d9a8cbe1a1e399284a78a2ac88bb5916f47e87a

Commit: 5d9a8cbe1a1e399284a78a2ac88bb5916f47e87a

Tree: e616a53f075e225287bc880ca507d4cb4b8f2681

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into llvm6

```

## Parents

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

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

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