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

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

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

Visibility: public

Requested revision: f27d82fe90e1d0007bf2d3ef52eac8cdbc381e0d

Requested commit: f27d82fe90e1d0007bf2d3ef52eac8cdbc381e0d

Commit: f27d82fe90e1d0007bf2d3ef52eac8cdbc381e0d

Tree: a5350e23ebaed579a4bb4e08eb0d01beb7d9b18e

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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