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

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

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

Visibility: public

Requested revision: c757984879687e465c6470fc1347cf0f14e46dcc

Requested commit: c757984879687e465c6470fc1347cf0f14e46dcc

Commit: c757984879687e465c6470fc1347cf0f14e46dcc

Tree: 9827a65bfcc0041a279d8a75b567cba83f9c5b16

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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