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

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

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

Visibility: public

Requested revision: df89291d1ca04a5891dd48ea5f6d1a99b6006bcb

Requested commit: df89291d1ca04a5891dd48ea5f6d1a99b6006bcb

Commit: df89291d1ca04a5891dd48ea5f6d1a99b6006bcb

Tree: 83970de0fdaa7383c11f64efceff7f88d6fd9cd9

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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