Commit Graph

23989 Commits

Author SHA1 Message Date
Joe Walker
3c8daefa96 Bug 1032789 - Pull together the various GCLI plugin points; r=mratcliffe 2014-07-10 14:37:09 +01:00
Carsten "Tomcat" Book
5789eb261c Merge mozilla-central to fx-team 2014-07-10 15:15:52 +02:00
Drew Willcoxon
90052e7eb6 Bug 1005601 - "gContextMenu is null" thrown for first textarea context menu in a window. r=Gijs 2014-07-10 03:31:04 -07:00
Ryan VanderMeulen
4c28391862 Merge fx-team to m-c. a=merge 2014-07-09 16:12:36 -04:00
Carsten "Tomcat" Book
ea15fbd89c Merge mozilla-central to fx-team 2014-07-09 16:15:17 +02:00
Carsten "Tomcat" Book
16ad20b23b Merge mozilla-central to mozilla-inbound 2014-07-09 16:13:17 +02:00
Carsten "Tomcat" Book
8d6946d993 merge fx-team to mozilla-central a=merge
--HG--
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/css/ot.min.css => browser/components/loop/content/libs/sdk-content/css/ot.css
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-predenied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-prompt-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-publisher.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-subscriber.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/buttons.png => browser/components/loop/content/libs/sdk-content/images/rtc/buttons.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/loader.gif => browser/components/loop/content/libs/sdk-content/images/rtc/loader.gif
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js => browser/components/loop/content/libs/sdk-content/js/dynamic_config.min.js
2014-07-09 16:05:08 +02:00
Ryan VanderMeulen
ea720a0cb7 Bug 1026310 - Really skip browser_UITour_panel_close_annotation.js on Windows.
DONTBUILD

--HG--
extra : rebase_source : 60ef0efe8d2ec531a12cbb4de56d001bd820c235
2014-07-09 09:57:14 -04:00
Wes Kocher
982f0c3d9e Merge m-c to fx-team 2014-07-08 20:07:49 -07:00
Shane Caraveo
aedc3b6357 Bug 1029942 allow activation from about: chrome urls, r=felipe 2014-07-08 16:48:12 -07:00
Wes Kocher
b9b6d80ffa Merge fx-team to m-c a=merge 2014-07-08 15:55:21 -07:00
Steven MacLeod
5710e7bbc5 Bug 1018720 - Change the options dropdown icon to match the select dropdown. r=florian
--HG--
extra : rebase_source : d7d7eb6d00158219c4113ecbaf958649f13692eb
extra : histedit_source : 77d847c52f3dc563b8f13343c0720500cebc422c
2014-07-07 15:48:20 -04:00
Steven MacLeod
42ae4ef033 Bug 1018720 - Change the translation infobar select dropdown styling to match the options dropdown. r=florian
--HG--
extra : rebase_source : 3be092aa43b1356728f3a9064cb49949c75bab50
extra : histedit_source : b55c90b6cb24f3795e3848652cd0980bb645b098
2014-07-07 15:45:35 -04:00
Steven MacLeod
756a7d9289 Bug 1018720 - Fix translation infobar button styling. r=florian
--HG--
extra : rebase_source : 27ee6b3d8555e96fd72936118a6a599fab8da64a
extra : histedit_source : e935ce68b124e328e4e9a65abc403caf221eeac3
2014-07-07 15:23:50 -04:00
Steven MacLeod
7484b612ea Bug 1018720 - Switch the translation infobar select box icon and add a HiDPI variant. r=florian
--HG--
extra : rebase_source : ca98e16a58e5ea2d16b48fa5a678008f268202c0
extra : histedit_source : 141dc4c7baca51e1eec06838a42c88f9471b28e3
2014-07-03 17:03:59 -04:00
Florian Quèze
0b78ab35fa Bug 1032139 - Make the 'Translations by' string localizable, r=felipe. 2014-07-08 15:56:34 +02:00
Alexandre Poirot
05dbcb6419 Bug 1013997 - Use only one compartment for all devtools modules. r=mossop, r=past 2014-07-07 06:07:00 -04:00
Carsten "Tomcat" Book
661821e027 Merge mozilla-central to fx-team 2014-07-08 15:28:15 +02:00
Carsten "Tomcat" Book
611b2eff0f merge fx-team to mozilla-central a=merge 2014-07-08 15:10:56 +02:00
Victor Porof
416df7bddb Bug 1034670 - The canvas graphs should draw the background separately from the plotted data, r=pbrosset 2014-07-08 09:02:00 -04:00
Victor Porof
cecde6961f Bug 1034668 - The getMappedSelection method for all canvas graphs should clamp the selection bounds, r=pbrosset 2014-07-08 09:02:00 -04:00
Victor Porof
fa40f4ef56 Bug 1034664 - The canvas graphs should use a cache of canvas elements instead of creating a new one every time an off-screen render target is needed, r=pbrosset 2014-07-08 09:02:00 -04:00
Athena
da882d0c2e Bug 977273 - Set aria-pressed state on Console filter buttons. r=robcee f=marcoz 2014-07-07 19:55:00 +02:00
Sami Jaktholm
82656bbb5c Bug 1035126 - Remove a legacy inspector test browser_inspector_tree_height.js. r=pbrosset 2014-07-07 04:06:00 +02:00
Brian Grinstead
200ddbc0fa Bug 1033855 - Do not show delete context menu item for project root. r=harth 2014-07-07 13:47:00 +02:00
Brian Grinstead
44bb20aaab Bug 1033853 - Do not reload files that have changed in project editor. r=harth 2014-07-07 07:45:00 +02:00
Brian Grinstead
dec17fd1bf Bug 1031472 - Automatically reload all preferences in source editor. r=vporof,harth 2014-07-07 13:52:00 +02:00
Panos Astithas
0a166913b1 When the page is paused, send all keyboard events to the debugger frame (bug 1019024). r=rcampbell
--HG--
extra : rebase_source : 0aaba81bd24e2a95bc247954af45d8b6dab3ef27
2014-07-07 19:45:13 +03:00
Gregory Szorc
a8fec952c2 Bug 1033836 - Rename services-common to services/common; rs=rnewman
The upcoming build system patches don't support hypthens in path names.
Changing this for that reason is kind of silly, but it's the easiest
way. Besides, nothing else uses hyphens in directory names.

--HG--
extra : rebase_source : 42dda2b1f16a3c0bfe17397a70092362e400530f
2014-07-02 16:49:36 -07:00
Wes Kocher
6bab75eeaf Merge m-c to fx-team 2014-07-07 16:39:00 -07:00
Wes Kocher
b74cdc0fdc Merge inbound to m-c a=merge 2014-07-07 16:01:08 -07:00
Tim Taubert
3b451a02e5 Bug 965697 - Fix intermittent browser_sessionHistory.js failures by waiting until the history entry has been replaced. r=smacleod
--HG--
extra : rebase_source : 2c134be33a3ba6e4916d8645eb662141eb1ecbfa
2014-07-07 14:11:17 -04:00
Gijs Kruitbosch
a26d810268 Bug 1035211 - don't call acceptDialog for privacy pane private browsing change in in-content prefs, r=jaws
--HG--
extra : rebase_source : cde84a8a08de69f205b1572d85f270c28b6de56f
2014-07-07 18:40:05 +01:00
Gijs Kruitbosch
40b2b37a99 Bug 1035164 - fix nullcheck in CustomizableWidgets, remove warning for items without shortcut in subviews, r=jaws
--HG--
extra : rebase_source : 0b58d1d43a877f8776ac99fe20dda9c4495c4643
2014-07-07 18:38:25 +01:00
Carsten "Tomcat" Book
047203d8b9 Backed out changeset 161b47c4a8ad (bug 1005870) for memory leaks 2014-07-07 15:58:00 +02:00
Carsten "Tomcat" Book
9133aeb725 Merge mozilla-central to fx-team 2014-07-07 15:33:48 +02:00
Carsten "Tomcat" Book
1f167c72c2 merge fx-team to mozilla-central a=merge 2014-07-07 14:27:41 +02:00
Carsten "Tomcat" Book
2dd11a1885 merge mozilla-inbound to mozilla-central a=merge 2014-07-07 14:18:45 +02:00
Tim Taubert
846c0a1bf0 merge m-c to fx-team; a=merge 2014-07-06 09:16:35 -07:00
Marco Bonardo
0383cc2ef4 Bug 1023292 - split up browser_popupNotification.js r=adw,MattN
--HG--
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification.js
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification_2.js
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification_3.js
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification_4.js
rename : browser/base/content/test/general/head.js => browser/base/content/test/popupNotifications/head.js
2014-07-06 10:14:48 +02:00
Benoit Jacob
1f6562d6f3 Bug 1028588 - Fix dangerous public destructors of Mac-specific reference-counted classes - r=mstange 2014-07-06 11:25:31 -04:00
Nick Fitzgerald
4cc2063490 Bug 1032379 - Automatically black box sources whose URL ends with '.min.js'. r=past 2014-07-03 09:44:00 -04:00
David Rajchenbach-Teller
52b6e27178 Bug 1005870 - Adding a copy() command to the console. r=robcee 2014-07-04 08:10:00 +02:00
Victor Porof
42e36a74e3 Bug 1034661 - The canvas graphs are ugly on screens with low dpi, r=pbrosset 2014-07-07 07:20:47 -04:00
Carsten "Tomcat" Book
c511c6f006 Merge mozilla-central to mozilla-inbound 2014-07-07 15:20:32 +02:00
Athena
12ba719bd9 Bug 977169 - Apply aria-label "x panel" to Toolbox r=bgrins f=marcoz 2014-07-07 11:27:10 +02:00
Gijs Kruitbosch
b8ef5bf613 Bug 1014313 - part 1: add tabs options to tabstrip context menu, r=dao 2014-07-02 23:23:48 +01:00
Wes Kocher
267a796ba5 Backed out changeset ca2fd67a4cf7 (bug 1029942) for bc1 orange 2014-07-08 15:11:31 -07:00
Shane Caraveo
99408869c7 Bug 1029942 allow activation from about: chrome urls, r=felipe 2014-07-08 13:50:13 -07:00
82ac629637 Bug 1034043 - Fix remaining use of "awlaysAsk" attribute in applications pref pane. r=Unfocused 2014-07-03 06:04:00 +12:00
Gijs Kruitbosch
8c6a9eaae3 Bug 987230 - use consumeanchor attribute to fix button click, r=enn,mconley
--HG--
extra : rebase_source : 8e52a377eeb708e258f0190fcbc5902c5477c2b8
2014-07-01 01:09:43 +01:00
David Rajchenbach-Teller
53b1bd0e8d Bug 1035557 - "about:sessionrestore shows instead of about:welcomeback after a reset". r=smacleod 2014-07-08 05:58:00 +02:00
Richard Marti
5797c38974 Bug 1035540 - Convert Security pane dialogs to be in-content. r=MattN 2014-07-08 23:24:11 +02:00
Andrei Oprea
30cb02236a Bug 1030490 - Inconsistent behavior when incrementing values in the CSS rules. r=harth 2014-07-01 15:35:52 -07:00
Sami Jaktholm
9a39579ad7 Bug 988314 - Clean up and rewrite Inspector tests to use Task.jsm and generators. r=pbrosset 2014-07-08 02:29:00 +02:00
Athena
77e6b6a7a2 Bug 977262 - Add aria-roles/aria-selected to Toolbox tabs. r=bgrins f=marcoz 2014-07-08 07:42:00 +02:00
Piyush Waradpande
2d58e5ee67 Bug 967156 - Adding class 'black-boxed' to blackboxed source after reload. r=fitzgen 2014-07-08 10:41:00 +02:00
Gabriel Luong
fe5145b8fc Bug 966895 - [rule view] Adding new rules to the current selection in the CSS rule-view. r=harth 2014-07-07 09:18:00 +02:00
Wes Kocher
8543987c26 Merge m-c to inbound 2014-07-08 20:04:41 -07:00
Blake Kaplan
7b09b38e37 Bug 1001957 - Don't use a CPOW for reload. r=felipe/mccr8/smaug
Original patch from billm.
2014-07-08 18:27:59 -07:00
Wes Kocher
22e853cb38 Backed out changeset 76a96d6f0330 (bug 1001957) for mochitest-2 bustage on a CLOSED TREE 2014-07-08 17:55:35 -07:00
Blake Kaplan
4767b88b60 Bug 1001957 - Don't use a CPOW for reload. r=felipe/mccr8/smaug
Original patch from billm.
2014-07-08 16:19:10 -07:00
Mark Banner
50bafcdcd0 Fix packaged unit test bustage from bug 1032469. rs=bustage fix for CLOSED TREE 2014-07-08 21:11:06 +01:00
Mark Banner
2a1f3ed8fe Bug 1032469 Update Loop to OpenTok library v2.2.6. rs=gijs for test change,r=abr
--HG--
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/css/ot.min.css => browser/components/loop/content/libs/sdk-content/css/ot.css
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-predenied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-prompt-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-publisher.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-subscriber.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/buttons.png => browser/components/loop/content/libs/sdk-content/images/rtc/buttons.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/loader.gif => browser/components/loop/content/libs/sdk-content/images/rtc/loader.gif
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js => browser/components/loop/content/libs/sdk-content/js/dynamic_config.min.js
2014-07-08 19:40:59 +01:00
Boris Zbarsky
789fa590c9 Bug 857648 part 5. Expose a .stack property on DOMExceptions. r=khuey 2014-07-04 01:25:16 -04:00
Carsten "Tomcat" Book
5e94534145 Merge mozilla-central to mozilla-inbound 2014-07-14 15:22:19 +02:00
Richard Marti
b5c6728638 Bug 1037081 - Remove the -moz-user-select from treecols. r=MattN 2014-07-12 20:19:06 +02:00
Jan-Ivar Bruaroey
ee90e13f9a Bug 998989 - anonymize sensitive data in telemetry log. r=ekr, r=dveditz 2014-07-10 19:53:44 -04:00
Jan-Ivar Bruaroey
dc592db24e Bug 998989 - save as telemetry ping file for upload by telemetry. r=vladan 2014-07-10 12:33:13 -04:00
Nicolas Perriault
cbabe13b74 Bug 1033841: Ported Loop panel views to React. r=Standard8 2014-07-04 17:08:55 +01:00
Nicolas Perriault
2f2e635d91 Bug 1033841: Added react 0.10.0 to loop shared libs. r=dmose 2014-07-04 17:08:54 +01:00
Benoit Jacob
66b6a33f72 Back out csets 56ba52f28300, f6016481c7f2, 94b064ee68b2 (bug 1033841 and bug 1033965) for xpcshell test failures 2014-07-04 13:34:25 -04:00
Nicolas Perriault
c79432aef1 Bug 1033841: Ported Loop panel views to React. r=Standard8 2014-07-04 17:08:55 +01:00
Nicolas Perriault
60655ea6e4 Bug 1033841: Added react 0.10.0 to loop shared libs. r=dmose 2014-07-04 17:08:54 +01:00
Panos Astithas
261aff14fb Avoid a race in CodeMirror initialization when setting breakpoints and don't let ESC stop navigation if the debugger is paused (bug 957174). r=vporof
--HG--
extra : rebase_source : 475e7969d92e237c7b38713cab8feb6d6464bb70
2014-06-19 10:15:14 +03:00
Victor Porof
4a4223b6aa Bug 1034585 - Sources with BreakStatements can't be parsed correctly, r=past 2014-07-04 14:54:51 -04:00
Victor Porof
81767b4864 Bug 1034129 (relanded) - Event listeners should be clustered together by type in the events pane, r=past 2014-07-04 14:54:49 -04:00
Dão Gottwald
9ae37d3736 Bug 1034077 - Location bar shouldn't strip whitespace when pasting. r=Gijs 2014-07-04 17:16:55 +02:00
Carsten "Tomcat" Book
a65765d382 Backed out changeset 0685c59d2e94 (bug 1034129) for dt test failures 2014-07-04 15:57:55 +02:00
Victor Porof
1f65788ccf Bug 1034129 - Event listeners should be clustered together by type in the events pane, r=past 2014-07-04 08:19:38 -04:00
Patrick Brosset
ef80e5bc4e Bug 1034004 - Avoid unhandled rejected promise in browser_ruleview_completion-new-property_02.js; r=bgrins 2014-07-04 10:21:49 +02:00
Jordan Santell
8ff38f9b38 Bug 1034212 - Enable e10s tests for devtools web audio editor. r=vp 2014-07-03 13:14:00 +02:00
Brian Grinstead
7268144cbe Bug 1034079 - Add a hover effect on resume button. r=vporof 2014-07-03 07:51:00 +02:00
Jordan Santell
f8ecba660d Bug 986705 - Implement web audio server events for connecting to an AudioParam in the web audio editor. r=vp 2014-07-02 12:37:00 +02:00
Tim Taubert
59aa45bbe8 Bug 1032243 - about:newtab should use native Promise implementation r=adw 2014-07-02 16:38:20 -07:00
Steven MacLeod
ff57929c78 Bug 1022405 - Adjust translation infobar height to increase padding on OSX. r=florian
--HG--
extra : rebase_source : 65f1146bd7d0163b49d92922f5e2b68f9fc60157
2014-06-30 20:35:05 -04:00
Ryan VanderMeulen
4f1ab194d5 Merge m-c to fx-team. a=merge 2014-07-03 17:07:17 -04:00
Ryan VanderMeulen
19918db2e4 Merge inbound to m-c. a=merge 2014-07-03 17:03:48 -04:00
Shane Caraveo
5e61a2db19 Bug 1032932 fix talos regression with share button, r=Gijs 2014-07-03 12:11:28 -07:00
Bernardo P. Rittmeyer
45106af80d Bug 1023339 - Fixed in-content preferences clickable areas width to cover only the element and its label. r=mconley 2014-07-03 13:59:08 -04:00
Mike Conley
95cf17e5f1 Backout ba704d0b0b09 (Bug 1023339) because there was a much better way to pull this off. 2014-07-03 13:58:26 -04:00
Ryan VanderMeulen
7a41b8a75b Backed out changeset f007a1c34042 (bug 1005870) for mochitest-dt leaks. 2014-07-03 13:43:15 -04:00
Mike Connor
57d3336978 Bug 1003159 - Default the updater to downloading the entire update at once for Nightly/Aurora. r=rstrong 2014-07-03 09:32:36 -07:00
David Rajchenbach-Teller
9dcc402178 Bug 1005870 - Add a copy() command to the console. r=robcee 2014-07-03 06:40:00 -04:00
Sami Jaktholm
e3e98913f1 Bug 997065 - Don't render multiple request header blocks if a request is inspected before it is finished. r=vporof 2014-07-02 10:16:00 -04:00
Andrei Oprea
cb2268d351 Bug 1015891 Implement ToS and privacy notice links for Loop. r=dmose 2014-07-03 15:22:09 +01:00
Mark Banner
d9baa97c30 Bug 1032741 Adapt to latest Loop server changes - update parameter name for /calls_url and add a callType parameter when starting a call. r=nperriault 2014-07-03 15:15:16 +01:00
Carsten "Tomcat" Book
9334142531 Backed out changeset afdb479e6427 (bug 966895) for causing Bug 1034015 2014-07-03 14:40:34 +02:00
Carsten "Tomcat" Book
6d08f5491e Merge mozilla-central to fx-team 2014-07-03 14:28:45 +02:00
Carsten "Tomcat" Book
a7edf1454f merge fx-team to mozilla-central a=merge 2014-07-03 13:54:51 +02:00