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

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

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

Visibility: public

Requested revision: 491d818f17aa94b94998da51ebce6d153491744b

Requested commit: 491d818f17aa94b94998da51ebce6d153491744b

Commit: 491d818f17aa94b94998da51ebce6d153491744b

Tree: 0bffe308c399b4ec9a4bae95349fea47f8387f94

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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