Merge commit '8c0ceafb0f25da077ff23e394667119f031574fd'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 3 Mar 2016 16:12:16 +0000 (16:12 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 3 Mar 2016 16:12:35 +0000 (16:12 +0000)
This commit is a no-p. We already have a mechanism to do this.

* commit '8c0ceafb0f25da077ff23e394667119f031574fd':
  urlprotocol: receive a list of protocols from the caller

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge