mozilla/addon-sdk — pull request #1218 by Mossop (2013-08-22 23:28:01+00:00)
Title: Backport intermittent test fixes to firefox25

Very few conflicts here, only test-firefox-tabs needed some tweaking as the entire test got switched to the new style after one test got removed in master. Looking all green on try.