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

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

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

Visibility: public

Requested revision: e7ab2bc5534a53c57c900618ec2411542dc50f69

Requested commit: e7ab2bc5534a53c57c900618ec2411542dc50f69

Commit: e7ab2bc5534a53c57c900618ec2411542dc50f69

Tree: 42c572bf7414f59a98cd40a37e7d2f5d94955084

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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