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

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

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

Visibility: public

Requested revision: bbfff4614614726dd2ef2c05f851f91be5368f84

Requested commit: bbfff4614614726dd2ef2c05f851f91be5368f84

Commit: bbfff4614614726dd2ef2c05f851f91be5368f84

Tree: 9cbfbb8b744c883150312bc9adf068778c60397e

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

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

```

## Parents

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

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

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