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

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

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

Visibility: public

Requested revision: b5d07297dec61a3993dfe91ceee2c87672db1e8e

Requested commit: b5d07297dec61a3993dfe91ceee2c87672db1e8e

Commit: b5d07297dec61a3993dfe91ceee2c87672db1e8e

Tree: 519d097fcdfe121e38814a080868a85f5b1f9e64

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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