Merge commit '20b75970e43a030f959b17ff2dfd561174b6f24e'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:40:15 +0000 (16:40 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:40:15 +0000 (16:40 +0100)
commit962e15d0f525557928ec6d42b49d19dd5c4833c5
tree0933ae05830524cab196a99f9551a00c4e9d1bfc
parent8892739a160594e390fbdcd3c8bccd9eb21e8104
parent20b75970e43a030f959b17ff2dfd561174b6f24e
Merge commit '20b75970e43a030f959b17ff2dfd561174b6f24e'

* commit '20b75970e43a030f959b17ff2dfd561174b6f24e':
  file protocol: handle the file: protocol string in file_check

This commit is a noop, see 77015443a84bb5dbed38eafc2ea26a2bf2641ed6

Merged-by: Clément Bœsch <u@pkh.me>