Brian R. Bondy
c97793c692
Bug 711692 - Various fixes for intermittent failures. r=rstrong.
2011-12-28 21:08:37 -05:00
Brian R. Bondy
2fdf796977
Bug 711692 - appbin fix and SCM lock hang fix. r=rstrong.
2012-01-04 23:19:19 -05:00
Robert Strong
95ad280cda
Bug 711692 - Fail if service is started and doesn't stop at test start. r=bbondy.
2012-01-04 23:19:19 -05:00
Brian R. Bondy
3588126af5
Bug 711692 - Don't rely on event and don't uninstall/install service on updates. r=rstrong.
2012-01-04 23:19:19 -05:00
Brian R. Bondy
814dc1f222
Bug 711692 - Cleanup tests. r=rstrong.
2012-01-04 23:19:18 -05:00
Brian R. Bondy
36927de39a
Bug 711692 - Loop on app bin copy to ensure it can be removed (intermittent test failure). r=rstrong.
2012-01-04 23:19:18 -05:00
Brian R. Bondy
1d25a248b6
Bug 711834 - Clear out env variable after getting value from unelevated updater.exe. r=rstrong.
2012-01-04 23:19:18 -05:00
Brian R. Bondy
d80120e18e
Bug 711692 - Intermittent service callback log failure fix. r=rstrong.
2012-01-04 23:19:18 -05:00
Brian R. Bondy
51ebd2d43b
Bug 712211 - Stop service before the test as well and wait for 20 seconds at most. r=rstrong.
2012-01-04 23:19:18 -05:00
Brian R. Bondy
477121ea93
Bug 712155 - Maintenance service: Wait for service to stop before starting the next xpcshell test. r=rstrong.
2012-01-04 23:19:18 -05:00
Brian R. Bondy
195b8ef006
Bug 711834 - Fix force no UAC prompt for xpcshell tests. r=rstrong
2012-01-04 23:19:17 -05:00
Brian R. Bondy
e0a208e138
Bug 711792 - Speed up and simplify maintenance service update command processing. r=rstrong.
2012-01-04 23:19:17 -05:00
Robert Strong
5d94139de0
Bug 711692 - Append TEST_ID to app_console_log. r=bbondy.
2012-01-04 23:19:17 -05:00
Blair McBride
e0cb473eec
Bug 691389 - Error: win is null when performing drag&drop of a XPI file to Add-ons Manager tab. r=dtownsend
2012-01-05 01:17:52 +13:00
Tim Taubert
366196d6dd
merge m-c to fx-team
2012-01-01 16:51:47 +01:00
Joel Maher
a15d982fcf
Bug 701076 - [hoooking up make] Robotium integration into birch tree. r=blassey,bear
2011-12-31 10:03:36 -05:00
Blair McBride
1d164109b4
Bug 713815 - Addons with compatibility overrides are still able to be installed. r=dtownsend
...
--HG--
extra : rebase_source : 535a75a745b3e1b9b9ccb5013f77b889d7283867
2011-12-30 13:53:52 +13:00
Blair McBride
bfe83b896e
Bug 713816 - Add additional logging when parsing compatibility overrides. r=dtownsend
...
--HG--
extra : rebase_source : 78b866fc90e11847b726403a735b596ab609145e
2011-12-30 13:53:03 +13:00
Tim Taubert
ed3cb6f833
merge m-c to fx-team
2011-12-29 13:59:50 +01:00
Blair McBride
9f6ea534a7
Backout ea0539bb2118 (bug 685155) due to test failures on OSX
2011-12-29 05:10:58 +13:00
Blair McBride
96fe46069b
Bug 711693 - Send the compatibility mode when loading the Discovery pane. r=dtownsend
2011-12-28 23:37:43 +13:00
Kris Maglione
b459b04749
Bug 685155 - Add-on Manager should treat symbolic links the same as proxy files. r=dtownsend
2011-12-28 23:36:15 +13:00
Phil Ringnalda
a5baca4aac
Back out 04ef7f564450 (bug 701076) and 632f07583bd8 (bug 711591) for mochitest-oth bustage
2011-12-30 14:19:30 -08:00
Joel Maher
e67402658e
Bug 701076 - [hookup to make] Robotium integration into birch tree. r=blassey,bear
2011-12-30 15:57:34 -05:00
Ms2ger
a9fa22ee9c
Merge m-c to m-i.
2011-12-30 12:17:22 +01:00
Robert Strong
9fc224f58b
Bug 711692 - Some intermittent failures cleaned up for new maintenance service tests. r=bbondy.
2011-12-16 20:33:17 -05:00
Brian R. Bondy
041d4c3506
Bug 711682 - command line support to determine if updater is signed. r=rstrong.
2012-01-04 23:19:17 -05:00
Robert Strong
e40116e467
Bug 711660 - maintenance service updater tests can't be run locally. r=bbondy.
2011-12-16 20:33:17 -05:00
Brian R. Bondy
b374707209
Bug 711505 - Callback application should be locked when doing updates from the service. r=rstrong.
2012-01-04 23:19:16 -05:00
Brian R. Bondy
165e3a3c65
Bug 711140 - Use maintenance service if the fallback key is present so tests can run. r=rstrong.
2012-01-04 23:19:16 -05:00
Brian R. Bondy
c41584e6f4
Bug 709598 - If no registry keys exist for the install dir, don't try to use the maintenance service for updates. r=rstrong.
...
--HG--
rename : toolkit/components/maintenanceservice/pathhash.cpp => toolkit/mozapps/update/common/pathhash.cpp
rename : toolkit/components/maintenanceservice/pathhash.h => toolkit/mozapps/update/common/pathhash.h
2012-01-04 23:19:16 -05:00
Brian R. Bondy
e6f1faa1ee
Bug 708778 - Updater service used on Windows should drop as many permissions as possible. r=rstrong.
2012-01-04 23:19:16 -05:00
Brian R. Bondy
af8dcf0b95
Bug 709173 - updater.exe needs to be verified to be an updater, not just an executable signed by Mozilla. r=rstrong.
2012-01-04 23:19:16 -05:00
Brian R. Bondy
28a67f5a40
Bug 709158 - updater.exe was not verified to be a particular product's/channel's/version of the updater. r=rstrong.
2012-01-04 23:19:16 -05:00
Brian R. Bondy
d9f3ef0a5a
Bug 709183 - Callback path and arguments untrusted, don't use/pass them. r=rstrong.
2012-01-04 23:19:16 -05:00
Brian R. Bondy
86afcc4bf8
Bug 708854 - No longer use session ID for work item files. r=rstrong.
...
--HG--
rename : toolkit/mozapps/update/common/launchwinprocess.cpp => toolkit/mozapps/update/common/updatehelper.cpp
rename : toolkit/mozapps/update/common/launchwinprocess.h => toolkit/mozapps/update/common/updatehelper.h
2012-01-04 23:19:15 -05:00
Ehsan Akhgari
c83fd30f2f
Bug 481815 - Make sure that the maintenance service tests are only run when the service is enabled. r=rstrong.
...
--HG--
rename : toolkit/mozapps/update/test/Makefile.in => toolkit/mozapps/update/test_svc/Makefile.in
rename : toolkit/mozapps/update/test/unit/test_0000_bootstrap_svc.js => toolkit/mozapps/update/test_svc/unit/test_0000_bootstrap_svc.js
rename : toolkit/mozapps/update/test/unit/test_0110_general_svc.js => toolkit/mozapps/update/test_svc/unit/test_0110_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0111_general_svc.js => toolkit/mozapps/update/test_svc/unit/test_0111_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0112_general_svc.js => toolkit/mozapps/update/test_svc/unit/test_0112_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0120_channelChange_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0120_channelChange_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0150_appBinReplaced_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0150_appBinReplaced_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0151_appBinPatched_xp_win_partial_svc.js => toolkit/mozapps/update/test_svc/unit/test_0151_appBinPatched_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test/unit/test_0160_appInUse_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0160_appInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0170_fileLocked_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial_svc.js => toolkit/mozapps/update/test_svc/unit/test_0171_fileLocked_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test/unit/test_0180_fileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0180_fileInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0181_fileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/test_svc/unit/test_0181_fileInUse_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test/unit/test_0182_rmrfdirFileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0182_rmrfdirFileInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0183_rmrfdirFileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/test_svc/unit/test_0183_rmrfdirFileInUse_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update_svc.js => toolkit/mozapps/update/test_svc/unit/test_0200_app_launch_apply_update_svc.js
rename : toolkit/mozapps/update/test/unit/xpcshell_updater_windows_svc.ini => toolkit/mozapps/update/test_svc/unit/xpcshell.ini
2012-01-04 23:19:15 -05:00
Ehsan Akhgari
a4f0bf9dcb
Bug 481815 - Automated tests for updates using the maintenance service; r=rstrong.
...
--HG--
rename : toolkit/mozapps/update/test/unit/test_0110_general.js => toolkit/mozapps/update/test/unit/test_0110_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0111_general.js => toolkit/mozapps/update/test/unit/test_0111_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0112_general.js => toolkit/mozapps/update/test/unit/test_0112_general_svc.js
rename : toolkit/mozapps/update/test/unit/test_0120_channelChange_complete.js => toolkit/mozapps/update/test/unit/test_0120_channelChange_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0150_appBinReplaced_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0150_appBinReplaced_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0151_appBinPatched_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0151_appBinPatched_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test/unit/test_0160_appInUse_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0160_appInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test/unit/test_0180_fileInUse_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0180_fileInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0181_fileInUse_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0181_fileInUse_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test/unit/test_0182_rmrfdirFileInUse_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0182_rmrfdirFileInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test/unit/test_0183_rmrfdirFileInUse_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0183_rmrfdirFileInUse_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js => toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update_svc.js
2012-01-04 23:19:14 -05:00
Brian R. Bondy
54527b0e1a
Bug 481815 - Provide a Windows service for silent updates. r=rstrong.
2012-01-04 23:19:14 -05:00
Kyle Huey
fa9858a33c
Merge m-c to b-s.
2012-01-03 12:49:46 -05:00
Siddharth Agarwal
56ce9200bc
Bug 515374 - Add a flag, currently off by default but possible to turn on per-app, to make packager.pm warnings fatal. r=khuey
2011-12-23 04:48:37 +05:30
Gregory Szorc
2e6dd31eef
merge m-c to s-c
2011-12-19 12:26:39 -08:00
Richard Newman
4bcff60b8f
Merge m-c to s-c.
2011-12-16 09:16:17 -08:00
Richard Newman
398f53edc0
Merge m-c to s-c.
2011-12-15 11:55:38 -08:00
Doug Sherk
6b007a4035
Bug 710103: Update XPCShell tests for GfxInfo blocklisting r=joe a=mbrubeck
2011-12-14 21:04:35 -08:00
Gregory Szorc
59e9109685
Merge m-c to s-c
2011-12-14 17:29:29 -08:00
Blair McBride
e2e21cb17f
Bug 709531 - Addons Manager tests should have AMO-related prefs reset after each test to disallow network access. r=dtownsend a=mbrubeck
2011-12-15 14:00:19 +13:00
Richard Newman
ebb87ea4e2
Merge m-c to s-c.
2011-12-14 11:28:32 -08:00
Kyle Huey
1e7fd9668d
Bug 709531: Turn off more Addon Manager tests that depend on AMO. r=ehsan a=me CLOSED TREE
2011-12-14 13:48:20 -05:00
Kyle Huey
78c484d529
Bug 709531: Turn off Addon Manager tests that depend on AMO. r=ehsan a=me CLOSED TREE
2011-12-14 13:43:06 -05:00
Richard Newman
506ad02a77
Merge m-c to s-c.
2011-12-14 01:58:41 -08:00
Margaret Leibovic
8e736f945e
Bug 710240 - Tapping on "Tap to play" link reloads page instead of playing plugin. r=dolske a=no-cpp
2011-12-13 14:29:11 -08:00
Richard Newman
722a434c38
Merge m-c to s-c.
2011-12-13 10:58:43 -08:00
Axel Hecht
8c0347871e
bug 709980, make INNER_UNMAKE_PACKAGE end up in the same dir, fixing omnijar, r=ted
2011-12-13 01:26:32 +01:00
Marco Bonardo
632b40fdbb
Bug 706280 - Intermittent failure in browser/components/places/tests/chrome/test_bug549192.xul | Exited with code 1 during test run.
...
r=felipe a=tests-only
2011-12-13 17:27:09 +01:00
Geoff Lankow
622bc2f0d5
Bug 708397 - "addon-options-displayed" notification fires before XBL bindings apply; r=Unfocused, a=Unfocused
2011-12-13 23:32:11 +13:00
Richard Newman
217d992ac2
Merge m-c to s-c.
2011-12-11 21:30:28 -08:00
John Schoenick
1c874917cd
Bug 687679 - Rename JS_CompileFile to JS_CompileUTF8File, fix users. r=jorendorff,jst
2011-12-16 11:08:59 -08:00
Geoff Lankow
8fdfc439b4
Bug 702748 - Use a pref for disabling per-site remembering of download directory; r=gavin.sharp, a=khuey
2011-12-12 17:31:50 +13:00
Blair McBride
7755266e12
Bug 706387 - Send the compatibility mode when using AMO Search API. r=dtownsend a=khuey
2011-12-12 15:02:13 +13:00
Blair McBride
7664d8eaac
Bug 709620 - Fix test_updatecheck.js when update channel is aurora/beta/release. r=bustage a=edmorley
2011-12-12 12:08:06 +13:00
Michael Wu
1a41cf6a34
Bug 710029 - Assorted build system tweaks for B2G/Gonk. r=khuey
2011-12-16 13:26:32 -08:00
Steffen Wilberg
c65f823afc
Bug 710064: Make the 'Update Add-ons Automatically' checkbox state depend on the extensions.update.enabled pref, in addition to the existing extensions.update.autoUpdateDefault pref. r=mossop
2011-12-16 21:52:14 +01:00
Ms2ger
c3c3bdba73
Backed out changeset ba447ace2594 (bug 687679) for bustage.
2011-12-16 21:17:16 +01:00
John Schoenick
a355d623f2
Bug 687679 - Rename JS_CompileFile to JS_CompileUTF8File, fix users. r=jorendorff,jst
2011-12-16 11:08:59 -08:00
Dave Townsend
1cd8e3f6d4
Bug 704988: Check the add-on hotfix is signed by a specific certificate. r=robstrong, r=Unfocused
2011-12-16 12:04:28 -08:00
Dave Townsend
8af0b5129b
Bug 704987: Ignore the hotfix add-on when warning users about incompatible add-ons. r=robstrong
2011-12-16 12:04:40 -08:00
Dave Townsend
0c5f63c121
Bug 694068: Automatically download and install an available hotfix add-on. r=Unfocused
2011-12-16 12:04:50 -08:00
Rob Campbell
11ba15c7c7
merge fx-team to m-c
...
--HG--
rename : browser/devtools/styleinspector/test/browser/browser_bug683672.js => browser/devtools/styleinspector/test/browser_bug683672.js
rename : browser/devtools/styleinspector/test/browser/browser_styleinspector.js => browser/devtools/styleinspector/test/browser_styleinspector.js
2011-12-16 14:42:54 -04:00
Richard Newman
1bdae035b2
Merge m-c to s-c.
2011-12-09 08:52:38 -08:00
Ed Morley
2b74cc516b
Merge last green changeset of mozilla-inbound to mozilla-central
2011-12-09 11:12:51 +00:00
Ehsan Akhgari
73f27461e5
Bug 708123 - Add a telemetry probe for update status; r=rstrong
2011-12-09 11:37:16 -05:00
Richard Newman
44f1e389ba
Merge m-c to s-c.
2011-12-08 12:23:54 -08:00
Mark Banner
f7fbb2cc66
Bustage fix for comm-central apps after bug 481815 - use MOZILLA_DIR not topsrcdir. rs=kheuy
2011-12-08 18:06:44 +00:00
Richard Newman
c7dc46b3b9
Merge m-c to s-c.
2011-12-08 08:37:43 -08:00
Ed Morley
0516735614
Merge last green changeset of mozilla-inbound to mozilla-central
2011-12-08 15:12:20 +00:00
Fabrice Desré
542e8850b9
merge
2011-12-07 20:14:00 -08:00
Richard Newman
dfb65b7c35
Merge m-c to s-c.
2011-12-07 18:49:05 -08:00
Steffen Wilberg
16c1c82b1b
Bug 701987: Remove checkbox for add-on auto-checking for updates (extensions.update.enabled) from the options window, and make enabling extensions.update.autoUpdateDefault in the add-ons manager also enable extensions.update.enabled. ui-review=boriss, r=mossop, a=xul/js-only
2011-12-12 21:56:26 +01:00
Blair McBride
0fed52ecb8
Bug 679588 - Fix intermittent test timeout of browser_select_update.js, browser_select_confirm.js, and browser_select_selection.js. r=dtownsend
2011-12-07 23:48:44 +13:00
Blair McBride
2ec721d13a
Bug 706777 - Automatically repopulate AddonRepository database on application upgrade. r=dtownsend
2011-12-07 23:48:33 +13:00
Mike Hommey
2144923ad8
Bug 695843 part 10 - Allow nested omni.jar and build one for Android. r=bsmedberg
2011-12-08 11:03:36 +01:00
Gregory Szorc
fd23477d7d
Bug 704973 - syncGUID defined earlier, not always call to database; r=Mossop
2011-12-06 09:33:40 -08:00
Mike Hommey
6e62c747d6
Backout 45820730dfa7 and 860035a3c04a (bug 701371) and 8ac6f34b44ff (bug 709776) because of Android random oranges.
...
--HG--
rename : mozglue/build/Makefile.in => memory/mozutils/Makefile.in
rename : mozglue/build/dummy.cpp => memory/mozutils/dummy.cpp
rename : mozglue/build/fixcrt.py => memory/mozutils/fixcrt.py
rename : mozglue/build/mozglue.def.in => memory/mozutils/mozutils.def.in
rename : mozglue/android/APKOpen.cpp => other-licenses/android/APKOpen.cpp
rename : mozglue/android/APKOpen.h => other-licenses/android/APKOpen.h
rename : mozglue/android/nsGeckoUtils.cpp => other-licenses/android/nsGeckoUtils.cpp
2011-12-28 12:12:09 +01:00
Mike Hommey
00bf052883
Bug 701371 - Rename mozutils to mozglue, and move it to top-level. r=khuey
...
--HG--
rename : memory/mozutils/Makefile.in => mozglue/Makefile.in
rename : memory/mozutils/Makefile.in => mozglue/build/Makefile.in
rename : memory/mozutils/dummy.cpp => mozglue/build/dummy.cpp
rename : memory/mozutils/fixcrt.py => mozglue/build/fixcrt.py
rename : memory/mozutils/mozutils.def.in => mozglue/build/mozutils.def.in
2011-12-28 08:24:02 +01:00
Geoff Lankow
48d0dde864
Bug 712518 - Improve MockFilePicker.jsm; r=jmaher
2011-12-23 11:10:52 +13:00
Cameron McCormack
228778cef4
Bug 670858 - Ignore some expected and fix some unexpected exceptions in xpinstall tests. r=dtownsend
2011-12-04 12:13:41 +11:00
Hugo Tavares Reis
69d0e0619c
Bug 676187 - Ensure fileContents are freed, fixed a memory leak in toolkit/mozapps/readstrings/readstrings.cpp. r=bbondy
2011-12-14 23:39:31 -08:00
Jon Buckley
8f54548bcc
Bug 691876 - Add mozutil library to jsshell distributable
2011-12-08 01:32:11 -05:00
Chris AtLee
aa6338033f
Bug 481815: makefile hooks required for signing executable files, installer packages, and mars. r=ted
...
--HG--
extra : rebase_source : 7b696910865fdbc9191cb7511f558879a9b9e05d
2011-12-07 17:06:52 -05:00
Henri Sivonen
98826c1b42
Back out bug 701787 due to orangeness conflict with tests added in bug 664179.
2011-12-07 15:11:47 +02:00
Masatoshi Kimura
ceeaf421c9
Bug 701787 - Part 1: disallow responseType and withCredentials for sync XHR. r=smaug
2011-12-07 13:29:00 +02:00
Axel Hecht
7879ad4e90
bug 702302, bug 705137, enable l10n repacks for native UI, r=blassey,wesj
...
Fixing the l10n.ini and filter.py for both native and xul UI.
Fixing the repack logic for native to support both single-locale repacks
and multi-locale builds.
Removing some deb packaging code, that's not of any use for android native.
2011-12-06 16:54:12 +01:00
Brad Lassey
8221758c4c
merge birch to mozilla-central
...
--HG--
rename : embedding/android/GeckoBatteryManager.java => mobile/android/base/GeckoBatteryManager.java
2011-12-06 13:55:36 -05:00
Doug Turner
5976ea245c
merge with m-c 1900e3edd32d
2011-11-30 22:30:21 -08:00
Brad Lassey
2d71f62306
bug 701380 - Implement a native about:home (start page) r=mfinkle
...
--HG--
extra : rebase_source : 3b61498dc4a17fbec21531bd831994f81fb85532
2011-11-29 01:38:35 -05:00
Mark Finkle
710acf764f
Backout beea574981d2, e3266cb5a2a7 - tree is burning (no bug)
2011-11-29 08:42:22 -05:00
Brad Lassey
3819538c94
bug 701380 - Implement a native about:home (start page) r=mfinkle
2011-11-29 01:38:35 -05:00
L. David Baron
9a1fd62f9c
Merge mozilla-central to birch.
2011-11-24 15:28:46 -08:00
Doug Turner
fc6550a16b
Merge mozilla-central 0ea84b44a7f1
2011-11-23 12:29:40 -08:00