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

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

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

Visibility: public

Requested revision: fe39ca01bcbee0077b21d5ddc2776df974e8c6d3

Requested commit: fe39ca01bcbee0077b21d5ddc2776df974e8c6d3

Commit: fe39ca01bcbee0077b21d5ddc2776df974e8c6d3

Tree: 1bb4775c795f8c15887e85fd3b6aeb3f2fe1b36c

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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