Merge branch '3660-project-editable' closes #3660

author Tom Clegg <tom@curoverse.com>

Tue, 26 Aug 2014 00:41:43 +0000 (20:41 -0400)

committer Tom Clegg <tom@curoverse.com>

Tue, 26 Aug 2014 00:41:43 +0000 (20:41 -0400)
author Tom Clegg <tom@curoverse.com>
Tue, 26 Aug 2014 00:41:43 +0000 (20:41 -0400)
committer Tom Clegg <tom@curoverse.com>
Tue, 26 Aug 2014 00:41:43 +0000 (20:41 -0400)
diff --cc services/api/app/models/arvados_model.rb
Simple merge
diff --cc services/api/test/unit/permission_test.rb
Simple merge
author	Tom Clegg <tom@curoverse.com>
	Tue, 26 Aug 2014 00:41:43 +0000 (20:41 -0400)
committer	Tom Clegg <tom@curoverse.com>
	Tue, 26 Aug 2014 00:41:43 +0000 (20:41 -0400)
		1	2
services/api/app/models/arvados_model.rb	patch \|	diff1 \|	diff2 \|	blob \| history
services/api/test/unit/permission_test.rb	patch \|	diff1 \|	diff2 \|	blob \| history