Auto merge of #5274 - klnusbaum:epoch_5214, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 2 Apr 2018 17:53:03 +0000 (17:53 +0000)
committerbors <bors@rust-lang.org>
Mon, 2 Apr 2018 17:53:03 +0000 (17:53 +0000)
rename epoch to edition

Per issue #5214 let's rename all instances of epoch to Edition


Trivial merge