Merge branch 'jk/url-decode'

* jk/url-decode:
  decode file:// and ssh:// URLs
  make url-related functions reusable

diff --cc Makefile
Simple merge