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

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

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

Visibility: public

Requested revision: 58ce79f9352a6139c873df6d99d1531101350e9f

Requested commit: 58ce79f9352a6139c873df6d99d1531101350e9f

Commit: 58ce79f9352a6139c873df6d99d1531101350e9f

Tree: 227df3571b4ac48afc38777902251647870c5e1b

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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