Merge branch 'master' into 6652-test-system-menu
authorManoj <jonam33@gmail.com>
Tue, 21 Jul 2015 15:32:04 +0000 (11:32 -0400)
committerManoj <jonam33@gmail.com>
Tue, 21 Jul 2015 15:32:04 +0000 (11:32 -0400)
commit68b018141677e7147fe2b52a88561dc7d57e6d79
tree08e16d840ad07743fb61424976ad1c1acd060296
parent61d432f332dd9314f8c4cd57c2393e80e8ecef59
parent106df13f4470b75e6fb4114c94b32b6fc68736f4
Merge branch 'master' into 6652-test-system-menu

Conflicts:
apps/workbench/test/integration/application_layout_test.rb
apps/workbench/test/integration/application_layout_test.rb