qjob
Merge branch 'master' of github.com:elmanuelito/config

Conflicts:
	scripts/qjob