Merge branch 'master' into 2875-pipeline-description
authorradhika <radhika@curoverse.com>
Fri, 12 Sep 2014 17:23:06 +0000 (13:23 -0400)
committerradhika <radhika@curoverse.com>
Fri, 12 Sep 2014 17:23:06 +0000 (13:23 -0400)
commit32b97aec0d210ec7a951f441cc6a44b4d0921a90
tree9ff5c7f9d5c0c71542978a19c3d152af0183cb97
parenta31f94b1b433964c1481c384f2989392321d5529
parentac594f16176901b7692be354045226e093b14218
Merge branch 'master' into 2875-pipeline-description

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