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

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

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

Visibility: public

Requested revision: 3a600297ca3f99ee57630c44900eec1fe7c92804

Requested commit: 3a600297ca3f99ee57630c44900eec1fe7c92804

Commit: 3a600297ca3f99ee57630c44900eec1fe7c92804

Tree: 9642e53df266077c0ee76c1a045366f8f805fe95

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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