From: bors <bors@rust-lang.org>
Date: Fri, 3 Mar 2017 08:05:43 +0000 (+0000)
Subject: Auto merge of #3782 - alexcrichton:more-proc-macro, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~9^2~117
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a226b3ca04037e52bfcdc9d21bfeeefb18dab5d5;p=cargo.git

Auto merge of #3782 - alexcrichton:more-proc-macro, r=matklad

Accept proc_macro in addition to proc-macro

More historical behavior...
---

a226b3ca04037e52bfcdc9d21bfeeefb18dab5d5