Commit Graph

357 Commits

Author SHA1 Message Date
Henri Sivonen
750178f54e Bug 959061 - Have only one "Chinese, Simplified" item in the Character Encoding menu. r=Unfocused. 2014-01-30 14:39:25 +02:00
Gijs Kruitbosch
0f268638e2 Bug 936442 - part 1: refactor CharsetMenu to allow Australis code to use it, r=Unfocused 2014-01-27 11:56:04 +00:00
Gijs Kruitbosch
f181d30b06 Bug 936442 - fix charset accesskey issue caused by Australis refactor, rs=trivial 2014-01-30 12:34:48 +00:00
Gregory Szorc
2c12c3f4d1 Bug 875562 - Part 3: XPCOM service for managing crash data; r=ted, bsmedberg
--HG--
extra : rebase_source : 4d4ce909634a079f1032c431bd639fef5b3f38ce
2014-01-23 15:49:24 -08:00
Gijs Kruitbosch
544be39fe0 Bug 964064 - shortcuts should always be uppercase, r=Unfocused 2014-01-26 23:53:22 +00:00
Tom Schuster
8e322c8fdc Bug 952042 - Remove fake focus-ring after findbar is closed. r=mikedeboer 2014-01-24 13:08:38 +01:00
Florian Quèze
1260c52839 Bug 958071 - PopupNotification consumers should have a way to replace the "Not Now" item, r=dolske. 2014-01-23 11:48:33 +01:00
Florian Quèze
ac7bc4b937 Bug 943292 - Camera icon/popup for gUM access can get hidden, r=felipe. 2014-01-17 23:31:07 +01:00
Tim Abraldes
bd0b2b1e10 bug 959399. Make metroFx honor the "show my tabs from last time" startup option. r=mbrubeck. r=jimm. 2014-01-16 15:38:12 -08:00
Roberto A. Vitillo
c451ab67ee Bug 913070 - Move TelemetryPing to a jsm. r=Yoric, r=glandium
--HG--
rename : toolkit/components/telemetry/TelemetryPing.js => toolkit/components/telemetry/TelemetryPing.jsm
2014-01-13 14:20:09 +00:00
Matt Brubeck
b5e2c0b510 Bug 958101 - Pass named params to onFindResult as object properties [r=evilpie] 2014-01-13 17:58:33 -08:00
Drew Willcoxon
48a297014c Bug 809056 - Reduce thumbnailing impact by capturing and storing only top sites. r=markh 2014-01-07 12:59:18 -08:00
Matt Brubeck
9510850e62 Bug 916481 - Make Finder.jsm send back the selection rect of the find result [r=evilpie,emtwo] 2014-01-09 07:58:26 -08:00
Wes Kocher
d779fe495a Backed out changeset f552ce04bc36 (bug 809056) for m-bc orange 2014-01-08 22:02:28 -08:00
Drew Willcoxon
6b99010477 Bug 809056 - Reduce thumbnailing impact by capturing and storing only top sites. r=markh 2014-01-07 12:59:18 -08:00
Neil Rashbrook
78bfb85ad5 Bug 940907 Re-introduce the Character Encoding menu to the View Source window r=Unfocused
--HG--
rename : browser/locales/en-US/chrome/browser/charsetMenu.dtd => toolkit/locales/en-US/chrome/global/charsetMenu.dtd
rename : browser/locales/en-US/chrome/browser/charsetMenu.properties => toolkit/locales/en-US/chrome/global/charsetMenu.properties
rename : browser/modules/CharsetMenu.jsm => toolkit/modules/CharsetMenu.jsm
2014-01-06 08:44:19 +00:00
Florian Quèze
708945744b Bug 723951 - Popup notification does not continue when the tab move to other window, r=felipe. 2013-12-19 22:16:10 +01:00
Peiyong Lin
ecc882cb2b Bug 943422 - Implement FileUtils.openAtomicFileOutputStream. r=Yoric
--HG--
extra : rebase_source : 054092dc72130bb4c60f48bb80a3ca0adfd42d45
2013-12-17 10:57:03 -05:00
Bill McCloskey
b32b498134 Bug 937377 - [e10s] Selecting an item in a <select> should trigger onChange (r=felipe) 2013-12-10 13:46:21 -08:00
Neil Rashbrook
8ef08c88a8 Bug 956657 Followup tweak r=Unfocused 2014-02-25 00:19:36 +00:00
Michael Comella
68d50c3fae Bug 935807: Restore arrow key input field navigation behavior. r=bnicholson 2013-12-04 15:43:32 -08:00
Paolo Amadini
1be00c4aed Bug 940408 - Rework DeferredTask to allow asynchronous tasks and support AsyncShutdown. r=Mossop 2013-12-03 13:21:08 +01:00
Carsten "Tomcat" Book
325e1c28d4 Backed out changeset 295b75fac0c8 (bug 940408) for test failures in B2g Desktop Linux & B2G ICS Emulator Opt 2013-12-03 12:53:27 +01:00
Paolo Amadini
1664144e6a Bug 940408 - Rework DeferredTask to allow asynchronous tasks and support AsyncShutdown. r=Mossop 2013-12-03 10:15:22 +01:00
Brian R. Bondy
ac97ab95cf Bug 940936 - Use profile name in registry sync prefs for WindowsPrefSync.jsm. r=jimm 2013-12-02 09:58:26 -05:00
Brian R. Bondy
8dc3707c01 Bug 931801 - Make shared pref sync code 2-way. r=jimm 2013-11-19 15:54:03 -05:00
Mike Hommey
9245936f8b Bug 874266 - Move all DEFINES that can be moved to moz.build. r=mshal 2013-11-27 22:55:07 +09:00
Mike Hommey
2b828323f2 Backout changeset 3fd4b546eed4 (bug 874266) and changeset a35d2e3a872f (bug 942043) for ASAN build bustage and Windows test bustage
--HG--
extra : amend_source : f20d09aeff1c8b5cbd0f1d24c7ce04e86f3aed1d
2013-11-28 14:24:05 +09:00
Mike Hommey
d210f8ff00 Bug 874266 - Move all DEFINES that can be moved to moz.build. r=mshal 2013-11-28 13:08:16 +09:00
Mark Hammond
a23c27a977 Bug 941469 - RemoteWebProgress doesn't pass flags param for onLocationChange. r=felipe 2013-11-22 17:39:05 +11:00
Mike Hommey
bb6779efe3 Bug 939044 - Remove most definitions of MODULE. r=mshal 2013-11-19 11:47:39 +09:00
Gijs Kruitbosch
4f5a01fecc Merge mozilla-central and ux 2013-11-15 18:32:01 +01:00
Matthew Noorenberghe
c32c2b79c8 Merge mozilla-central to UX 2013-11-09 17:46:29 -08:00
Gijs Kruitbosch
af554675e2 Merge mozilla-central and ux 2013-11-07 19:21:54 +00:00
Gijs Kruitbosch
c38e551bb3 Merge mozilla-central and ux 2013-11-06 09:01:08 +01:00
Gijs Kruitbosch
6d27553ea9 Merge mozilla-central and ux 2013-11-03 23:36:57 +01:00
Gijs Kruitbosch
63530f7b09 Merge mozilla-central and ux 2013-11-01 23:24:47 +01:00
Nils Maier
7589bdcf5e Bug 932548 - Improve stack/message generation for uncaught Promise.jsm rejections. r=yoric 2013-10-31 23:23:10 -04:00
Olli Pettay
d4cc84ad8f Bug 933070, MessageManager should use nsTObserverArray, r=fabrice 2013-11-05 13:52:04 +02:00
Mark Hammond
5d2aaf2137 Bug 935379 - RemoteWebProgress should handle missing/failing progress listener methods. r=felipe 2013-11-07 10:43:59 +11:00
Bill McCloskey
1d8c765619 Bug 923333 - Replace docShell.setCurrentURI with something e10s-compatible (r=felipe) 2013-11-12 15:02:14 -08:00
Timothy Nikkel
51b4cb10f4 Bug 932419. Stop NS_ASSERT's from popping up a modal dialog in non-release builds, and fix aurora builds to be considered non-release builds for such purposes. r=dao 2013-11-01 22:47:22 -05:00
Tom Schuster
2d16b5da43 Bug 926033: correct searchString persistence for different searches in findbar. r=mikedeboer 2013-11-08 18:35:28 +01:00
Bill McCloskey
206328eaff Bug 931534 - Make back/forward dropdowns work using CPOWs (r=felipe) 2013-10-28 12:24:51 -07:00
Sebastian Hengst
8e623301f6 Bug 765285 - Include last 3 days of crash IDs in about:support. r=Mossop,dolske 2013-10-28 00:18:14 +01:00
Tareq Khandaker
354ad24d81 Bug 926635 - Improve layout of uncaught Promise.jsm error messages. r=Yoric 2013-10-27 08:03:51 -04:00
Robert Strong
e27c2d3d1d Bug 931267 - Convert deprecated octal literals in FileUtils.jsm. r=bbondy 2013-10-26 14:30:45 -07:00
Mike Hommey
61124c1afc Bug 921492 - Make StrictOrderingOnAppendList use actual alphabetical sorting. r=mshal,r=gps 2013-10-24 08:05:43 +09:00
Gijs Kruitbosch
7c77a454d1 Bug 927605 - invert the cloverleaf flag, r=vporof 2013-10-22 14:00:51 +02:00
Gijs Kruitbosch
6574bca193 Bug 927605 - refactor keyboard shortcut code in devtools into a JSM, r=Unfocused,vporof
--HG--
rename : browser/devtools/shared/helpers.js => toolkit/modules/ShortcutUtils.jsm
2013-10-20 22:50:37 +02:00
Gijs Kruitbosch
e9c0b9a2ba Merge mozilla-central and ux 2013-10-29 17:23:48 +01:00
Gijs Kruitbosch
22c6a04002 Merge mozilla-central and ux 2013-10-28 23:41:12 +01:00
Gijs Kruitbosch
ce93f74110 merge m-c to UX 2013-10-27 21:18:18 +01:00
Gijs Kruitbosch
169105946a Merge mozilla-central and ux 2013-10-24 10:18:26 +02:00
Gijs Kruitbosch
31fd82d67b Bug 885066 - don't apply LWTs to windows already in customization mode, r=Unfocused 2013-10-22 12:20:38 +02:00
Gijs Kruitbosch
b3de82cf5d Merge mozilla-central and ux 2013-10-23 00:37:14 +02:00
Gijs Kruitbosch
19083f9692 Merge mozilla-central and ux 2013-10-17 13:48:43 +02:00
Gijs Kruitbosch
d4bd26596b Merge mozilla-central and ux 2013-10-16 23:24:59 +02:00
Mike de Boer
1a01b24e0b Bug 923565: make ctrl-enter open the focused link in a new tab. r=evilpie 2013-10-16 17:45:42 +02:00
Mike de Boer
088dc6e939 Bug 921308: don't scroll when an element is focused on findbar close. r=evilpie 2013-10-16 17:04:49 +02:00
Wes Kocher
6667469963 Merge m-c to fx-team 2013-10-15 20:32:13 -07:00
Gijs Kruitbosch
7bfb0d8a76 Merge mozilla-central and ux 2013-10-16 13:15:41 +02:00
Gijs Kruitbosch
b6abc3f37b Merge mozilla-central and ux 2013-10-16 10:20:09 +02:00
Tom Schuster
1bf5476c00 Bug 921343 - Avoid removing selections done by the user when closing the findbar. r=mikedeboer 2013-10-15 20:02:23 -04:00
Gijs Kruitbosch
e81f7e529c Merge m-c to ux 2013-10-13 23:58:05 +02:00
Phil Ringnalda
482fc23a2c Merge m-i to m-c 2013-10-13 10:18:40 -07:00
David Rajchenbach-Teller
5dc74166d3 Bug 903433 - Report unhandled Promise.jsm exceptions upon garbage-collection. r=paolo 2013-10-12 14:17:46 -04:00
Mina Almasry
eaf7fb5d88 Bug 698437 - Allow spatial navigation with directional controller. r=kats 2013-10-12 13:59:50 -04:00
Carsten "Tomcat" Book
b1734348ec Backed out changeset 2f67ed3d7d6c (bug 451283) failures in mochitest and marionette
--HG--
rename : toolkit/modules/Log.jsm => services/common/log4moz.js
rename : toolkit/modules/tests/xpcshell/test_Log.js => services/common/tests/unit/test_log4moz.js
2013-10-12 10:51:43 +02:00
Gijs Kruitbosch
abc599e28f Merge mozilla-central and ux 2013-10-11 10:08:05 +02:00
Blair McBride
39b31b76d1 Bug 910172 - PermissionsUtils.jsm bustage fix for Gaia. r=bustage 2013-10-11 11:56:42 +13:00
Gijs Kruitbosch
5e082bb2fd Merge mozilla-central and ux 2013-10-10 20:23:18 +02:00
Blair McBride
5d8f6ea36f Bug 910172 - Refactor XPIProvider.importPermissions out to a reusable JSM. r=Mossop 2013-10-10 14:30:34 +13:00
Gijs Kruitbosch
c18d784b3c Merge m-c to ux 2013-10-03 17:20:04 +02:00
Ms2ger
105ce73cfa Bug 922268 - Remove empty makefiles; r=gps 2013-10-03 09:10:00 +02:00
Gijs Kruitbosch
b3eb0d57af Merge mozilla-central and ux 2013-10-02 09:48:41 +02:00
Gijs Kruitbosch
91b9c7b656 Merge mozilla-central and ux 2013-10-02 00:00:14 +02:00
Gijs Kruitbosch
5d3ed7cf58 Merge m-c to UX 2013-10-01 00:36:26 +02:00
Ryan VanderMeulen
40233fbb80 Merge fx-team to m-c.
--HG--
rename : mobile/android/base/UpdateServiceHelper.java => mobile/android/base/updater/UpdateServiceHelper.java
2013-09-30 16:18:53 -04:00
David Rajchenbach-Teller
63018393b8 Bug 922665 - Prevent AsyncShutdown from attempting to use the crash reporter if it is disabled. r=froydnj 2013-10-01 11:48:42 -04:00
Gijs Kruitbosch
aa719d2b2d Merge mozilla-central and ux 2013-09-28 09:59:15 +02:00
Mark Capella
5628f20963 Bug 472963 - TableExists and IndexExists does not work for temporary tables, r=mak 2013-09-27 17:04:17 -04:00
Gregory Szorc
b03f79a7e6 Bug 920223 - Part 3: Mass convert MOCHITEST_BROWSER_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:06 +02:00
Gregory Szorc
cc1da2c22a Bug 920223 - Part 2: Mass convert MOCHITEST_CHROME_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:01 +02:00
Gijs Kruitbosch
2780a0f874 Merge mozilla-central and ux 2013-09-27 10:35:54 +02:00
David Rajchenbach-Teller
e3ecce0148 Bug 917764 - If clients fail to resolve AsyncShutdown blockers, crash the process. r=froydnj, r=ted
--HG--
rename : toolkit/modules/tests/xpcshell/test_phase.js => toolkit/modules/tests/xpcshell/test_AsyncShutdown.js
2013-09-30 10:59:40 -04:00
Ed Morley
038cae0901 Backed out changeset 68b6b152f51a (bug 920223) 2013-09-30 12:50:09 +01:00
Ed Morley
eccf636a23 Backed out changeset 8b02873ee07e (bug 920223) 2013-09-30 12:50:05 +01:00
Gregory Szorc
e4af98efbf Bug 920223 - Part 3: Mass convert MOCHITEST_BROWSER_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:06 +02:00
Gregory Szorc
483a776413 Bug 920223 - Part 2: Mass convert MOCHITEST_CHROME_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:01 +02:00
Gijs Kruitbosch
a3a29ecf94 Merge mozilla-central and ux 2013-09-25 10:16:54 +02:00
Tom Schuster
9ab2b41e39 Bug 919340 - Test. r=mikedeboer 2013-09-26 11:21:02 -04:00
Tom Schuster
e7e5cb82ea backout ef35a8971e08, because of buggy test 2013-09-26 12:01:05 -04:00
Tom Schuster
79e2a857bd Bug 919340 - Test. r=mikedeboer 2013-09-26 11:21:02 -04:00
Tom Schuster
2433096c63 Bug 919340 - Always draw outline around links when using quickfind. r=mikedeboer 2013-09-26 11:21:02 -04:00
Tom Schuster
403303d0c0 Bug 919344 - Avoid accessing dead objects in Finder.jsm after a page change. r=mikedeboer,dao 2013-09-26 11:21:02 -04:00
Gijs Kruitbosch
1a37a1de38 Merge mozilla-central and ux 2013-09-24 14:55:03 +02:00
David Rajchenbach-Teller
1c77a5e96c Bug 916729 - [Async shutdown] Handle exceptions. r=froydnj 2013-09-23 09:23:03 -04:00
Gregory Szorc
ed68c2482b Bug 901990 - Part 2: Upgrade xpcshell manifests; r=ted
--HG--
rename : toolkit/mozapps/extensions/test/xpcshell-unpack/head_unpack.js => toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
2013-09-24 11:50:08 -07:00
Gijs Kruitbosch
8ed9c0d44e Merge mozilla-central and ux 2013-09-21 13:14:05 +02:00
Gijs Kruitbosch
2d2aef1247 Merge m-c to UX 2013-09-18 10:31:05 +02:00
Tom Schuster
aa1efbba84 Bug 916534 - Test for find highlight should work in subframes. r=mikdeboer 2013-09-17 12:54:35 -04:00
Tom Schuster
d5d7de306d Bug 916534 - Find Highlight should work in subframes. r=mikdeboer 2013-09-17 12:54:35 -04:00
Gijs Kruitbosch
f55435100e Merge m-c to ux 2013-09-15 19:30:19 +02:00
Gijs Kruitbosch
45d2d8d2ee Merge m-c to ux 2013-09-13 09:42:13 +02:00
Blair McBride
f44c1d0d2f Bug 451283 - Move log4moz.js to Toolkit as Log.jsm. r=gps,Mossop
--HG--
rename : services/common/log4moz.js => toolkit/modules/Log.jsm
rename : services/common/tests/unit/test_log4moz.js => toolkit/modules/tests/xpcshell/test_Log.js
2013-08-26 11:55:58 -07:00
Blair McBride
b26d6917b1 Bug 451283 - Move log4moz.js to Toolkit as Log.jsm. r=gps,Mossop
--HG--
rename : services/common/log4moz.js => toolkit/modules/Log.jsm
rename : services/common/tests/unit/test_log4moz.js => toolkit/modules/tests/xpcshell/test_Log.js
2013-08-26 11:55:58 -07:00
Gregory Szorc
1392a7909f Bug 919535 - Use AsyncShutdown in Sqlite.jsm. r=Yoric 2013-10-02 14:24:33 +02:00
Gijs Kruitbosch
d954eba7ae Merge mozilla-central and ux 2013-09-08 14:26:44 +02:00
Matthew Noorenberghe
1f8ae35067 Merge mozilla-central to UX 2013-09-06 17:54:20 -07:00
Ryan VanderMeulen
d89885e3e2 Merge m-c to inbound. 2013-09-06 18:00:23 -04:00
Gijs Kruitbosch
5196ec76f2 Merge mozilla-central and ux 2013-09-06 18:44:23 +02:00
Brandon Benvie
772c363968 Bug 913115 - Make Task.jsm support ES6 generators. r=paolo 2013-09-06 09:36:55 -07:00
Mike Conley
717a6d0cec Automated merge with https://hg.mozilla.org/mozilla-central 2013-09-05 09:59:00 -04:00
Matthew Noorenberghe
8a8f2a6778 Merge mozilla-central to UX 2013-08-30 22:20:31 -07:00
Marco Castelluccio
59e7b21c31 Bug 910885 - Improve FileUtils.getDir(..., ..., true) performance. r=Yoric 2013-08-30 16:14:53 -04:00
Gijs Kruitbosch
e27ae39c3e Merge mozilla-central and ux 2013-08-29 23:55:09 +02:00
Gijs Kruitbosch
9ffae9f766 Merge mozilla-central and ux 2013-08-29 15:30:00 +02:00
Gijs Kruitbosch
17fded927d Merge m-c to UX. 2013-08-28 22:31:31 +02:00
Tim Abraldes
bf1450a127 bug 904230. Make nsIWinMetroUtils available as Services.metro. r=mbrubeck for the metro piece. r=rnewman for the sync piece. r=dolske for the toolkit piece. 2013-08-28 10:27:32 -07:00
Felipe Gomes
1a66852d13 Bug 897060 - Follow up, add missing license headers. r=me DONTBUILD 2013-08-27 22:09:44 -03:00
Tom Schuster
2f28506505 Bug 913280 - Electrolysis: Refactor RemoteWebProgress to use a Manager that owns the toplevel and all the sublevel WebProgress objects. r=felipe 2013-09-06 13:10:11 -04:00
Gijs Kruitbosch
4896af5c23 Merge m-c to UX 2013-08-26 19:05:49 +02:00
Felipe Gomes
b0494451ec Merge fx-team to m-c 2013-08-26 02:41:47 -03:00
Felipe Gomes
e36a075b54 Bug 897060 - Display select dropdowns in the parent process. r=enndeakin
Original patch by roc.
2013-08-25 22:34:23 -03:00
Mike Conley
751fb8a235 Automated merge with https://hg.mozilla.org/mozilla-central 2013-08-25 11:38:45 -04:00
Mike Hommey
f1cf3b4238 Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps 2013-09-05 09:01:46 +09:00
Honza Bambas
ea8ec4777e Bug 913807 - HTTP cache v2: API+top service+integration+tests, off by default, r=michal+ehsan+mark.finkle+fabrice+mhammond+gavin 2013-09-20 11:11:25 +02:00
Patrick Cloke
e2d7eecef7 Bug 898760 - Twitter says connected but shows nothing: truly make all options of Http.jsm optional, r=Mossop. 2013-08-20 20:16:28 -04:00
Ryan VanderMeulen
5dc1c55908 Merge m-c to inbound. 2013-10-01 17:23:59 -04:00
David Anderson
a10ba37203 Add RPC message support to messagemanager (bug 910493 part 2, r=smaug). 2013-10-01 09:15:06 -07:00
Bill McCloskey
60f524b349 Bug 905443 - Forward content policy shouldLoad calls from the child to the parent (r=felipe) 2013-08-28 21:43:46 -07:00
Bill McCloskey
bd7184b366 Bug 905439 - Infrastructure for e10s addon compatibility code (r=felipe) 2013-08-28 21:43:00 -07:00
Gijs Kruitbosch
bd240a29f7 merge m-c to ux 2013-08-23 15:01:54 +02:00
Gijs Kruitbosch
c948d50278 Merge m-c to UX 2013-08-22 19:55:04 +02:00
Gijs Kruitbosch
0096a5d012 Merge m-c to ux 2013-08-20 11:00:57 +02:00
Tom Schuster
26e3a4ac9a Bug 895957 - Implement a workaround for goDoCommand in e10s. r=neil 2013-08-21 13:24:53 -04:00
Irving Reid
386437c51e Bug 888753: Reschedule walker loop more often to avoid deadlocks with nested event loops; r=paolo 2013-08-19 15:55:20 -04:00
Mike Conley
2b52a4822e Automated merge with https://hg.mozilla.org/mozilla-central 2013-08-17 20:27:30 -04:00
Mike Conley
104ab62e44 Automated merge with https://hg.mozilla.org/mozilla-central 2013-08-09 19:24:40 -04:00
Marco Castelluccio
e63bb8b399 Bug 904929 - Task.jsm: exceptions handled differently if the argument is a regular function. r=paolo 2013-08-16 16:36:49 -04:00
Gijs Kruitbosch
f6ec1e3db6 Merge m-c to UX 2013-08-07 21:09:10 +02:00
Gijs Kruitbosch
60fd73b747 Merge m-c to ux 2013-08-02 17:21:19 +02:00
Matthew Noorenberghe
63923e35da Merge mozilla-central to UX 2013-07-31 17:48:12 -07:00
Tim Taubert
d026835370 Bug 895185 - Rename Promise.every() to .all() to reduce confusion about our differing implementation; r=paolo 2013-07-31 10:58:44 -07:00
Gijs Kruitbosch
211b357473 Merge m-c to UX 2013-07-30 20:27:46 +02:00
Gijs Kruitbosch
4d8bec1da1 Merge m-c to UX 2013-07-30 11:14:11 +02:00
Ryan VanderMeulen
78c8d092c8 Merge m-c to inbound. 2013-07-29 18:42:45 -04:00
Gijs Kruitbosch
0bf845f050 Merge m-c to UX. 2013-07-28 11:50:05 +02:00
Mike Conley
ec3ee297fc Automated merge with https://hg.mozilla.org/mozilla-central 2013-07-27 15:01:05 -04:00