From: radhika <radhika@curoverse.com>
Date: Fri, 12 Sep 2014 17:23:06 +0000 (-0400)
Subject: Merge branch 'master' into 2875-pipeline-description
X-Git-Tag: 1.1.0~2209^2~11
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/32b97aec0d210ec7a951f441cc6a44b4d0921a90?ds=sidebyside;hp=32b97aec0d210ec7a951f441cc6a44b4d0921a90

Merge branch 'master' into 2875-pipeline-description

Conflicts:
	services/api/app/models/pipeline_instance.rb
	services/api/db/structure.sql
---