Merge branch 'master' into 4015-collection-chooser-portable-data-hash

author Tim Pierce <twp@curoverse.com>

Thu, 23 Oct 2014 22:35:19 +0000 (18:35 -0400)

committer Tim Pierce <twp@curoverse.com>

Thu, 23 Oct 2014 22:35:19 +0000 (18:35 -0400)
author Tim Pierce <twp@curoverse.com>
Thu, 23 Oct 2014 22:35:19 +0000 (18:35 -0400)
committer Tim Pierce <twp@curoverse.com>
Thu, 23 Oct 2014 22:35:19 +0000 (18:35 -0400)
diff --cc apps/workbench/test/integration/pipeline_instances_test.rb
Simple merge
diff --cc services/api/test/fixtures/collections.yml
Simple merge
author	Tim Pierce <twp@curoverse.com>
	Thu, 23 Oct 2014 22:35:19 +0000 (18:35 -0400)
committer	Tim Pierce <twp@curoverse.com>
	Thu, 23 Oct 2014 22:35:19 +0000 (18:35 -0400)
		1	2
apps/workbench/test/integration/pipeline_instances_test.rb	patch \|	diff1 \|	diff2 \|	blob \| history
services/api/test/fixtures/collections.yml	patch \|	diff1 \|	diff2 \|	blob \| history