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

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

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

Visibility: public

Requested revision: cca93908e6d57f18054d153ca01d6869739306f2

Requested commit: cca93908e6d57f18054d153ca01d6869739306f2

Commit: cca93908e6d57f18054d153ca01d6869739306f2

Tree: b7316e13386963e5b08aebc1f5707498b64a9ebb

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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