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)
Revert "Seperate licenses with a `/`"

This reverts commit 1ddba76a0f5f83884d20be97f49452f9dd1897f1.

OR is the more modern form :rofl:

r? @alexcrichton


Trivial merge