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

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

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

Visibility: public

Requested revision: b897e98d30b7e471cdabf6b8f0baab44998265cd

Requested commit: b897e98d30b7e471cdabf6b8f0baab44998265cd

Commit: b897e98d30b7e471cdabf6b8f0baab44998265cd

Tree: 642a2e9b0eb824c9cae69bfd29a72c11eb4b7101

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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