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

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

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

Visibility: public

Requested revision: 7e37d268c86ccc823c4a381a42029722d36c3975

Requested commit: 7e37d268c86ccc823c4a381a42029722d36c3975

Commit: 7e37d268c86ccc823c4a381a42029722d36c3975

Tree: 1600a184f03fedd91131bcbaea2c5ee85dfa06a3

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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