# Merge remote-tracking branch 'origin/master' into io-stream-iface · gitcafe/zig

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

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

Visibility: public

Requested revision: 04626c176b328f7ae937b0828f14f4b4be62b733

Requested commit: 04626c176b328f7ae937b0828f14f4b4be62b733

Commit: 04626c176b328f7ae937b0828f14f4b4be62b733

Tree: ef8f5fe89abfd6592146dc9c15662b39c23a4788

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into io-stream-iface

```

## Parents

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

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

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