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

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

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

Visibility: public

Requested revision: 284ab109c4b83f7bb9a832f284f706e641b002fd

Requested commit: 284ab109c4b83f7bb9a832f284f706e641b002fd

Commit: 284ab109c4b83f7bb9a832f284f706e641b002fd

Tree: d7dc258a7e0676a9867e7941d8605074b57ea74a

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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