Bug 732169 - Refactor message processing prompts. r=lucasr
Bug 732169 - Associate prompts with tabs. r=lucasr
Bug 1053357 - Search terms with multiple spaces are displayed with plus signs in the location bar. r=gavin
Merge latest green fx-team changeset and mozilla-central; a=merge