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

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

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

Visibility: public

Requested revision: 6e1425e3123855422068738f0911d5cac9bb0aef

Requested commit: 6e1425e3123855422068738f0911d5cac9bb0aef

Commit: 6e1425e3123855422068738f0911d5cac9bb0aef

Tree: fe9e93e40d174bafeb20b74e7da8ed79c562ac19

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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