git.arvados.org - arvados.git/commit

author	Peter Amstutz <peter.amstutz@curoverse.com>
	Mon, 2 Jun 2014 12:52:06 +0000 (08:52 -0400)
committer	Peter Amstutz <peter.amstutz@curoverse.com>
	Mon, 2 Jun 2014 12:52:06 +0000 (08:52 -0400)
commit	e881778afbede03d32b842334113cba198052cfb
tree	c5a12ad4bb1cda8427d1c7d1ad590049d9049707	tree \| snapshot
parent	18e7ea91bc5e9cd7cd1f25bd009a67e6fd2cc06b	commit \| diff
parent	cff73e6feea770c80d9a63168de2be7cb6663a4d	commit \| diff

Merge remote-tracking branch 'origin/master' into origin-2939-re-run-job-button refs #2939

Conflicts:
services/api/db/schema.rb