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

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

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

Visibility: public

Requested revision: 1f96a866769423e363f1c48654c0f51ecf75db58

Requested commit: 1f96a866769423e363f1c48654c0f51ecf75db58

Commit: 1f96a866769423e363f1c48654c0f51ecf75db58

Tree: 504b4913f00bd6a32f097ea6061d5fa211d2c940

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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