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

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

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

Visibility: public

Requested revision: 32dd98b19fe3cc384df32704dac0ff3e377dbe0c

Requested commit: 32dd98b19fe3cc384df32704dac0ff3e377dbe0c

Commit: 32dd98b19fe3cc384df32704dac0ff3e377dbe0c

Tree: 2eddf3618d80313bdd24c25bd589bd474f3d82fc

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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