2872: Merge branch 'master' into 2872-folder-nav
authorTom Clegg <tom@curoverse.com>
Fri, 13 Jun 2014 14:33:07 +0000 (10:33 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 13 Jun 2014 14:33:07 +0000 (10:33 -0400)
commit40df5992d4d8071a6e10a20ecdeb0470a80764cc
treedd1805b686e6ee401d6595a02f61b18b8073b35c
parent62738e6c4087ad3001ea23bdb3e6b9c577701a55
parent4f1085f353d44600643a8e9dd6b43a39131e7946
2872: Merge branch 'master' into 2872-folder-nav

Conflicts:
apps/workbench/app/controllers/jobs_controller.rb
apps/workbench/app/controllers/jobs_controller.rb