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

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

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

Visibility: public

Requested revision: aa043a633904b6685a201000a0ab2a62fc3bdb91

Requested commit: aa043a633904b6685a201000a0ab2a62fc3bdb91

Commit: aa043a633904b6685a201000a0ab2a62fc3bdb91

Tree: 24520ed49575e88a6f6ed9592c1166efd1c074dd

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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