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

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

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

Visibility: public

Requested revision: 48cd808185f54e935714539d101585a9a0a41673

Requested commit: 48cd808185f54e935714539d101585a9a0a41673

Commit: 48cd808185f54e935714539d101585a9a0a41673

Tree: 3817592ec8e324e54debddf93d968847294cf8f6

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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