Change in http(s)-regex after GLundh's review
Merge remote-tracking branch 'upstream/master' into httpslinks
Merge pull request #136 from fredrikpersson/httpslinks

Httpslinks-change after GLund's review