Merge branch 'filecrop' of https://github.com/pw3t/searx into filecrop

Conflicts:
	searx/engines/filecrop.py
This commit is contained in:
pw3t 2013-12-29 16:32:13 +01:00
commit 016a26c79c

Diff Content Not Available