Merge branch 'master' into 3634-tab-state
authorPhil Hodgson <bitbucket@philhodgson.net>
Tue, 30 Sep 2014 12:28:55 +0000 (08:28 -0400)
committerPhil Hodgson <bitbucket@philhodgson.net>
Tue, 30 Sep 2014 12:28:55 +0000 (08:28 -0400)
commita77093bdb8cbbba6860bdda67da4d19ad3ac5a0c
tree7e2680b05408f37a8b9b938ee181f74048e68d22
parentc203e53c2929c2ddf1b079ec077364f8f4d23c40
parentb3fd3679187be8e51d31cb6bf17613cc488cda4b
Merge branch 'master' into 3634-tab-state

Conflicts:
apps/workbench/app/views/application/_content.html.erb
apps/workbench/app/assets/javascripts/application.js
apps/workbench/app/views/application/_content.html.erb