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

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

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

Visibility: public

Requested revision: 7dd18294b7988062461430d431eaad2ad7b19daa

Requested commit: 7dd18294b7988062461430d431eaad2ad7b19daa

Commit: 7dd18294b7988062461430d431eaad2ad7b19daa

Tree: 8ce835394267efdf369948f0438de35a29db3b9f

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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