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

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

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

Visibility: public

Requested revision: 47be64af5add5c146541c16dbb043ddf97f97d34

Requested commit: 47be64af5add5c146541c16dbb043ddf97f97d34

Commit: 47be64af5add5c146541c16dbb043ddf97f97d34

Tree: 3fabcb50c94b254a71cdbf009f29ad1ece6b1f67

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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