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

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

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

Visibility: public

Requested revision: 4b2719b51d7ec9a38bad57ca02040231b6e8df26

Requested commit: 4b2719b51d7ec9a38bad57ca02040231b6e8df26

Commit: 4b2719b51d7ec9a38bad57ca02040231b6e8df26

Tree: 7f3af852912303da208a806274f95c335ba9cb8a

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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