Merge branch 'master' into 3138-wiselinks
authorradhika <radhika@curoverse.com>
Sat, 26 Jul 2014 01:24:04 +0000 (21:24 -0400)
committerradhika <radhika@curoverse.com>
Sat, 26 Jul 2014 01:24:04 +0000 (21:24 -0400)
commitb653d031a5dbf2a42cf81d787753e945bf3911b4
tree9cc2ed8e0e53647830466ff06647194f01bdcc52
parent4fdfbe8fb9523451b0536042d14c2f229b75c0f3
parent08ab73ebc61834742594b0eb12c7d3fca4660360
Merge branch 'master' into 3138-wiselinks

Conflicts:
apps/workbench/app/views/layouts/application.html.erb
apps/workbench/app/views/layouts/body.html.erb
apps/workbench/test/integration/pipeline_instances_test.rb