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

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

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

Visibility: public

Requested revision: e3bf40742d5b93c10b8e68b202294badb508c3e7

Requested commit: e3bf40742d5b93c10b8e68b202294badb508c3e7

Commit: e3bf40742d5b93c10b8e68b202294badb508c3e7

Tree: 73a9219fd0f5ec7985eb9f121390fa2db24654f9

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'master' into freebsd2

```

## Parents

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

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

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