From: bors <bors@rust-lang.org>
Date: Mon, 2 Apr 2018 17:53:03 +0000 (+0000)
Subject: Auto merge of #5274 - klnusbaum:epoch_5214, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~107
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=551f6f31ae42d0cbc208b681ea516bc36abdb09f;p=cargo.git

Auto merge of #5274 - klnusbaum:epoch_5214, r=alexcrichton

rename epoch to edition

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

551f6f31ae42d0cbc208b681ea516bc36abdb09f