]> git.lizzy.rs Git - rust.git/commitdiff
Merge branch 'master' of https://github.com/nicokoch/rust
authorNicolas Koch <nioko1337@gmail.com>
Tue, 15 May 2018 13:26:11 +0000 (15:26 +0200)
committerNicolas Koch <nioko1337@gmail.com>
Tue, 15 May 2018 13:26:11 +0000 (15:26 +0200)

Trivial merge