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

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

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

Visibility: public

Requested revision: a2abdb185f9e47b663edce1bdfa3fa525502f321

Requested commit: a2abdb185f9e47b663edce1bdfa3fa525502f321

Commit: a2abdb185f9e47b663edce1bdfa3fa525502f321

Tree: 9027e6f6886937afa463563dae176e5757cf006e

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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