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

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

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

Visibility: public

Requested revision: ef6260b3a7ed09e5dc5d8383ad20f229411bd9ff

Requested commit: ef6260b3a7ed09e5dc5d8383ad20f229411bd9ff

Commit: ef6260b3a7ed09e5dc5d8383ad20f229411bd9ff

Tree: 23f2b5396a95cae6c730cdfafb7dfcdba7eca8f2

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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