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

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

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

Visibility: public

Requested revision: 84b963cb1b7cdc9b78eee315758914a9fae18064

Requested commit: 84b963cb1b7cdc9b78eee315758914a9fae18064

Commit: 84b963cb1b7cdc9b78eee315758914a9fae18064

Tree: 73f3ab4c444a746239d933c64b393125d3475175

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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