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

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

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

Visibility: public

Requested revision: fe660462837231353b846bf398637ca84f67bfc9

Requested commit: fe660462837231353b846bf398637ca84f67bfc9

Commit: fe660462837231353b846bf398637ca84f67bfc9

Tree: 37336cfcf44810d73d111a57207b843a01fd205f

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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