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

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

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

Visibility: public

Requested revision: f7f11e237c96a357e9a5e8b4a8ce2c6a7499de3b

Requested commit: f7f11e237c96a357e9a5e8b4a8ce2c6a7499de3b

Commit: f7f11e237c96a357e9a5e8b4a8ce2c6a7499de3b

Tree: 70daeb0c542c319511ff577b2f306ac43a4ea88b

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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