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

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

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

Visibility: public

Requested revision: 7109035b78ee05302bbdaadc52013b430a030b69

Requested commit: 7109035b78ee05302bbdaadc52013b430a030b69

Commit: 7109035b78ee05302bbdaadc52013b430a030b69

Tree: ae6d7202dc75f2c799f5fbcad72ccf8b02a954a4

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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