Allow multiple start/end ranges to be searched for
Merge branch 'master' of ssh://github.com/peadar/pstack

Conflicts:
	canal.cc