Small improvement for option -d when using files from a non-local
directory
Merge branch 'master' of https://github.com/proycon/colibri-core.git

Conflicts:
	src/classencode.cpp