Merge branch 'master' into 1978-compare-pipelines
authorTom Clegg <tom@curoverse.com>
Sat, 1 Feb 2014 23:34:44 +0000 (15:34 -0800)
committerTom Clegg <tom@curoverse.com>
Sat, 1 Feb 2014 23:34:44 +0000 (15:34 -0800)
commitdfca93f7d608930350b8aa680a3ffb3d35d63306
treeab6dd8c0a77c9c921558e1e69c4e7f20b6cf2b2c
parenteaa436ddd4aadf4fad387ea6115e35c885828ce0
parent9fd96762299e182afbf69e76e0560c748591af47
Merge branch 'master' into 1978-compare-pipelines

Conflicts:
apps/workbench/app/controllers/pipeline_instances_controller.rb
apps/workbench/app/views/pipeline_instances/compare.html.erb