minor fix
Minor

* 'inpaint' of https://github.com/chintak/scikit-image:
  Add `skimage.filter`

Conflicts:
	skimage/filter/inpaint.py