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

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

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

Visibility: public

Requested revision: ce68dda4b60914e947088e7cf0c5626ea7cebc08

Requested commit: ce68dda4b60914e947088e7cf0c5626ea7cebc08

Commit: ce68dda4b60914e947088e7cf0c5626ea7cebc08

Tree: fca8e600e1b48862d816e5caa87f6fa5ab50d175

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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