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

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

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

Visibility: public

Requested revision: dbde8254d02241d893140cb499ad25e8cbb3438a

Requested commit: dbde8254d02241d893140cb499ad25e8cbb3438a

Commit: dbde8254d02241d893140cb499ad25e8cbb3438a

Tree: af5be3723d32a378891fac4320e6a4b9a4edd674

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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