Auto merge of #5080 - matklad:hope-this-wont-be-re-reverted, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 26 Feb 2018 19:10:55 +0000 (19:10 +0000)
committerbors <bors@rust-lang.org>
Mon, 26 Feb 2018 19:10:55 +0000 (19:10 +0000)
commit8830eca1b24ddbe1dfe5794a012196592765e45d
tree64c70817d1147f2b80654367ee2ffba242bc6dac
parent62f05f41d33d0f59c0d2b3e8664393bcdee48e3c
parente3eb2868d8fc4afb77a328b4beaefa459806e58f
Auto merge of #5080 - matklad:hope-this-wont-be-re-reverted, r=alexcrichton

Revert "Seperate licenses with a `/`"

This reverts commit 1ddba76a0f5f83884d20be97f49452f9dd1897f1.

OR is the more modern form :rofl:

r? @alexcrichton