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

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

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

Visibility: public

Requested revision: 7903a758a44d1a253f17a4a2383f36b5fdad8545

Requested commit: 7903a758a44d1a253f17a4a2383f36b5fdad8545

Commit: 7903a758a44d1a253f17a4a2383f36b5fdad8545

Tree: 424ddbea805de30be2405790f81249435969ccb6

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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