Merge branch 'master' into 3634-tab-state
authorPhil Hodgson <bitbucket@philhodgson.net>
Mon, 6 Oct 2014 18:53:08 +0000 (14:53 -0400)
committerPhil Hodgson <bitbucket@philhodgson.net>
Mon, 6 Oct 2014 18:53:08 +0000 (14:53 -0400)
commit78ae561901fff56fad51a5aea9c92f3cea6f4bb3
treef2349f937eec15afafa2bafc1b55704eb259c05a
parentcd69027bc08cb58316b53e8b02ca56f70b5b9eca
parentc6b14938cfb90145dfcf9a8e5ea7264d63ac8035
Merge branch 'master' into 3634-tab-state

Conflicts (resolved):
apps/workbench/app/views/application/_title_and_buttons.html.erb
apps/workbench/app/views/application/_title_and_buttons.html.erb