make Qless.tag return values consistent
Merge pull request #45 from nitper/master

make Qless.tag return values consistent
Re-use `child_jid` rather than re-computing it repeatedly.
Expose a `spawned_from_jid` attribute of a job.

This returns the jid of the recurring job that
spawned a particular job, if there is one.
Fix error message so it is more accurate.
Merge pull request #49 from seomoz/add-source-recurring-job

Add source recurring job
Add requeue.

This is useful when you want to put a job back on a queue
(e.g. to have it tried again later) without worrying about
potentially resurrecting a cancelled job.
Merge pull request #51 from seomoz/add-requeue

Add requeue.
Merge branch 'upstream-master' into merge-upstream

Conflicts:
	base.lua
	job.lua
	queue.lua
	test/test_fail.py
	test/test_job.py
	test/test_locks.py
	test/test_queue.py
	test/test_recurring.py
merged master
Merge remote-tracking branch 'upstream/master' into merge-upstream

Conflicts:
	test/test_job.py
Merge pull request #7 from backupify/merge-upstream

Merge upstream