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)
commit510046c228cb1232313195c6a9b6a5345dddba0b
treed25b8d355e9daf2bbaf7a179eaa01197bac9dd69
parentba687ae0bdd168332261853a965576bc78c4f7e0
parent8c0ceafb0f25da077ff23e394667119f031574fd
Merge commit '8c0ceafb0f25da077ff23e394667119f031574fd'

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>