Merge branch 'master' of git://ralfj.de/rust-101
authorRalf Jung <post@ralfj.de>
Mon, 13 Jun 2016 12:01:09 +0000 (14:01 +0200)
committerRalf Jung <post@ralfj.de>
Mon, 13 Jun 2016 12:01:09 +0000 (14:01 +0200)

Trivial merge