Reduce common URLs across places tests to attempt to eliminate test-places intermittents, a+=@gozala
Merge pull request #1160 from Mossop/bug903115

Bug 903115: Many context-menu tests timeout on tinderbox. r=jsantell
Merge pull request #1161 from jsantell/893846-fix-tab-index-test

Fix Bug 893846 Fix tab.index test intermittent r+=@mossop
Merge pull request #1162 from ZER0/runner-fail/865391

Bug 865391 - Intermittent Jetpack TEST-UNEXPECTED-FAIL | unknown | Test ... r=@Mossop
Merge pull request #1163 from erikvold/846165p2

Bug 846165 - Intermittent tests/test-panel.test Document Reload a=@gozala
Merge pull request #1167 from erikvold/904136

Bug 904136 - Intermittent test failure: TEST-UNEXPECTED-FAIL | simple-prefs/main.testAOM | Timed out r=@Mossop
Merge pull request #1169 from erikvold/689291

Bug 689291 test-tabs.test window focus changes active tab | Test output exceeded timeout (60s). r=Mossop
Merge pull request #1173 from erikvold/905472

Bug 905472 - Intermittent TEST-UNEXPECTED-FAIL | tests/test-tabs.test window focus changes active tab | the activated tab url is correct. r=Mossop
Merge pull request #1174 from erikvold/899630v2

Bug 899630 - Intermittent Jetpack tests/test-tabs.testTabsEvent_onCloseWindow r=@ZER0
Merge pull request #1176 from erikvold/905338

Bug 905338 - Intermittent TEST-UNEXPECTED-FAIL | tests/test-panel.test Document Reload | Timed out r=@ZER0
Merge pull request #1177 from erikvold/901744

Bug 901744 more asserts for tests/test-window-events.test browser events r=@gozala
Merge pull request #1178 from erikvold/888804

Bug 888804 Converting the test-firefox-windows.js file to use the new test framework r=@jsantell
Disabling test-places-history/testSearchTimeRange for Bug 892619 temporarily, a=@mossop
Merge pull request #1203 from erikvold/905338p2

Bug 905338 only redirect the panel location if the message is as expected r=@Mossop
Merge pull request #1190 from erikvold/873007

Bug 873007 - Intermittent Jetpack tests/test-windows.testActiveWindow r=@Mossop
Merge pull request #1175 from erikvold/905354

Bug 905354 - Update test-tabs.js file r=@ZER0
Conflicts:
	test/tabs/test-firefox-tabs.js
	test/test-ui-button.js
Merge pull request #1218 from Mossop/firefox25

Backport intermittent test fixes to firefox25. a=Kwierso