Merge 1344db5662dc94359c1313ad7eb47cec2d34d00c into…

Authored by Deleted user <ghost@github.com> on Mon, Nov 5, 2:55 PM.
GitHub <noreply@github.com> committed rNIMBUS96cd25aed3ef: Merge 1344db5662dc94359c1313ad7eb47cec2d34d00c into… (authored by Deleted user <ghost@github.com>).Mon, Nov 5, 2:55 PM

Merged Changes

CommitAuthorDetailsCommitted
1344db5662dcporkbun
Make explicit links override detected links when both apply to the same span. 
May 26 2015