# Merge branch 'master' into llvm7 · gitcafe/zig

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

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

Visibility: public

Requested revision: b48948d6e805cdee7f33243098af9a862c152df1

Requested commit: b48948d6e805cdee7f33243098af9a862c152df1

Commit: b48948d6e805cdee7f33243098af9a862c152df1

Tree: 8b1b4b37670f7444e8fe12748a8db99ac7498cce

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into llvm7

```

## Parents

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

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

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