Commit Graph

177308 Commits

Author SHA1 Message Date
Ryan VanderMeulen
a3431ee9b8 Merge inbound to m-c. 2014-04-08 18:17:58 -04:00
Ryan VanderMeulen
d87da59f33 Merge b2g-inbound to m-c. 2014-04-08 18:09:36 -04:00
Wes Johnston
3e276199e0 Bug 985400 - Post menu changes to UIThread to avoid issues with animatinos. r=lucasr 2014-04-08 12:14:40 -07:00
Michael Comella
e06b7b5ec8 Bug 981872 - Replace sha-1 MessageDigest with NativeCrypto. r=nalexander 2014-04-08 11:44:38 -07:00
David Keeler
fc4890d5af bug 990603 - test override for server certificate with basic constraints: CA=true r=briansmith 2014-04-08 09:51:45 -07:00
David Keeler
e1f4b33afd bug 990603 - mozilla::pkix: defer reporting end-entity cert errors until after path building r=briansmith 2014-04-08 09:49:36 -07:00
Kannan Vijayan
842dc44679 Bug 993071 - Rename FunctionBoundary IR instructions to ProfilerStackOp. r=luke 2014-04-08 12:16:18 -04:00
Jonathan Watt
6facef9bfb Bug 993323 - Make nsWindowGfx::CreateIcon() use the new gfxUtils helper for format conversion. r=Bas 2014-04-08 16:12:28 +01:00
Patrick Brosset
50959813c8 Bug 988313 - Rename devtools/styleinspector tests for consistency reasons. r=miker
--HG--
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js => browser/devtools/styleinspector/test/browser_computedview_browser-styles.js
rename : browser/devtools/styleinspector/test/browser_bug589375_keybindings.js => browser/devtools/styleinspector/test/browser_computedview_keybindings_01.js
rename : browser/devtools/styleinspector/test/browser_computedview_bug835808_keyboard_nav.js => browser/devtools/styleinspector/test/browser_computedview_keybindings_02.js
rename : browser/devtools/styleinspector/test/browser_bug913014_matched_expand.js => browser/devtools/styleinspector/test/browser_computedview_matched-selectors-toggle.js
rename : browser/devtools/styleinspector/test/browser_bug683672.js => browser/devtools/styleinspector/test/browser_computedview_matched-selectors_01.js
rename : browser/devtools/styleinspector/test/browser_bug_692400_element_style.js => browser/devtools/styleinspector/test/browser_computedview_matched-selectors_02.js
rename : browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js => browser/devtools/styleinspector/test/browser_computedview_media-queries.js
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js => browser/devtools/styleinspector/test/browser_computedview_no-results-placeholder.js
rename : browser/devtools/styleinspector/test/browser_computedview_original_source_link.js => browser/devtools/styleinspector/test/browser_computedview_original-source-link.js
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js => browser/devtools/styleinspector/test/browser_computedview_search-filter.js
rename : browser/devtools/styleinspector/test/browser_computedview_copy.js => browser/devtools/styleinspector/test/browser_computedview_select-and-copy-styles.js
rename : browser/devtools/styleinspector/test/browser_computedview_734259_style_editor_link.js => browser/devtools/styleinspector/test/browser_computedview_style-editor-link.js
rename : browser/devtools/styleinspector/test/browser_ruleview_add_property_01.js => browser/devtools/styleinspector/test/browser_ruleview_add-property-and-reselect.js
rename : browser/devtools/styleinspector/test/browser_ruleview_editor_changedvalues_01.js => browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_01.js
rename : browser/devtools/styleinspector/test/browser_ruleview_editor_changedvalues_03.js => browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_02.js
rename : browser/devtools/styleinspector/test/browser_ruleview_cancel.js => browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_03.js
rename : browser/devtools/styleinspector/test/browser_ruleview_editor_changedvalues_02.js => browser/devtools/styleinspector/test/browser_ruleview_add-property_01.js
rename : browser/devtools/styleinspector/test/browser_ruleview_add_property_02.js => browser/devtools/styleinspector/test/browser_ruleview_add-property_02.js
rename : browser/devtools/styleinspector/test/browser_bug940500_rule_view_pick_gradient_color.js => browser/devtools/styleinspector/test/browser_ruleview_colorpicker-edit-gradient.js
rename : browser/devtools/styleinspector/test/browser_bug893965_css_property_completion_existing_property.js => browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_01.js
rename : browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_existing_property_value_pair.js => browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_02.js
rename : browser/devtools/styleinspector/test/browser_bug893965_css_property_completion_new_property.js => browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_01.js
rename : browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_new_property_value_pair.js => browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_02.js
rename : browser/devtools/styleinspector/test/browser_ruleview_bug_902966_revert_value_on_ESC.js => browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js
rename : browser/devtools/styleinspector/test/browser_bug722691_rule_view_increment.js => browser/devtools/styleinspector/test/browser_ruleview_edit-property-increments.js
rename : browser/devtools/styleinspector/test/browser_ruleview_manipulation.js => browser/devtools/styleinspector/test/browser_ruleview_edit-property-order.js
rename : browser/devtools/styleinspector/test/browser_ruleview_editor_changedvalues_04.js => browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js
rename : browser/devtools/styleinspector/test/browser_ruleview_edit.js => browser/devtools/styleinspector/test/browser_ruleview_edit-property_02.js
rename : browser/devtools/styleinspector/test/browser_ruleview_focus.js => browser/devtools/styleinspector/test/browser_ruleview_keybindings.js
rename : browser/devtools/styleinspector/test/browser_bug970532_mathml_element.js => browser/devtools/styleinspector/test/browser_ruleview_mathml-element.js
rename : browser/devtools/styleinspector/test/browser_bug722196_rule_view_media_queries.js => browser/devtools/styleinspector/test/browser_ruleview_media-queries.js
rename : browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_02.js => browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js
rename : browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_03.js => browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-priority.js
rename : browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_04.js => browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js
rename : browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_05.js => browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_02.js
rename : browser/devtools/styleinspector/test/browser_ruleview_original_source_link.js => browser/devtools/styleinspector/test/browser_ruleview_original-source-link.js
rename : browser/devtools/styleinspector/test/browser_ruleview_pseudoelement.js => browser/devtools/styleinspector/test/browser_ruleview_pseudo-element.js
rename : browser/devtools/styleinspector/test/browser_ruleview_copy.js => browser/devtools/styleinspector/test/browser_ruleview_select-and-copy-styles.js
rename : browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js => browser/devtools/styleinspector/test/browser_ruleview_style-editor-link.js
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_677930_urls_clickable.js => browser/devtools/styleinspector/test/browser_ruleview_urls-clickable.js
rename : browser/devtools/styleinspector/test/browser_bug942297_user_property_reset.js => browser/devtools/styleinspector/test/browser_ruleview_user-property-reset.js
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet.js => browser/devtools/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
rename : browser/devtools/styleinspector/test/browser_csslogic_inherited.js => browser/devtools/styleinspector/test/browser_styleinspector_csslogic-inherited-properties.js
rename : browser/devtools/styleinspector/test/browser_bug_592743_specificity.js => browser/devtools/styleinspector/test/browser_styleinspector_csslogic-specificity.js
rename : browser/devtools/styleinspector/test/browser_ruleview_editor.js => browser/devtools/styleinspector/test/browser_styleinspector_inplace-editor.js
rename : browser/devtools/styleinspector/test/browser_styleinspector_outputparser.js => browser/devtools/styleinspector/test/browser_styleinspector_output-parser.js
rename : browser/devtools/styleinspector/test/browser_bug765105_background_image_tooltip.js => browser/devtools/styleinspector/test/browser_styleinspector_tooltip-background-image.js
rename : browser/devtools/styleinspector/test/browser_bug946331_close_tooltip_on_new_selection.js => browser/devtools/styleinspector/test/browser_styleinspector_tooltip-closes-on-new-selection.js
rename : browser/devtools/styleinspector/test/browser_bug702577_fontfamily_tooltip_longhand.js => browser/devtools/styleinspector/test/browser_styleinspector_tooltip-longhand-fontfamily.js
rename : browser/devtools/styleinspector/test/browser_bug702577_fontfamily_tooltip_shorthand.js => browser/devtools/styleinspector/test/browser_styleinspector_tooltip-shorthand-fontfamily.js
rename : browser/devtools/styleinspector/test/browser_bug726427_csstransform_tooltip.js => browser/devtools/styleinspector/test/browser_styleinspector_tooltip-transform.js
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet.html => browser/devtools/styleinspector/test/doc_content_stylesheet.html
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet.xul => browser/devtools/styleinspector/test/doc_content_stylesheet.xul
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_imported.css => browser/devtools/styleinspector/test/doc_content_stylesheet_imported.css
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_imported2.css => browser/devtools/styleinspector/test/doc_content_stylesheet_imported2.css
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_linked.css => browser/devtools/styleinspector/test/doc_content_stylesheet_linked.css
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_script.css => browser/devtools/styleinspector/test/doc_content_stylesheet_script.css
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_xul.css => browser/devtools/styleinspector/test/doc_content_stylesheet_xul.css
rename : browser/devtools/styleinspector/test/browser_bug683672.html => browser/devtools/styleinspector/test/doc_matched_selectors.html
rename : browser/devtools/styleinspector/test/browser_bug722196_identify_media_queries.html => browser/devtools/styleinspector/test/doc_media_queries.html
rename : browser/devtools/styleinspector/test/browser_ruleview_pseudoelement.html => browser/devtools/styleinspector/test/doc_pseudoelement.html
rename : browser/devtools/styleinspector/test/sourcemaps.css => browser/devtools/styleinspector/test/doc_sourcemaps.css
rename : browser/devtools/styleinspector/test/sourcemaps.css.map => browser/devtools/styleinspector/test/doc_sourcemaps.css.map
rename : browser/devtools/styleinspector/test/sourcemaps.html => browser/devtools/styleinspector/test/doc_sourcemaps.html
rename : browser/devtools/styleinspector/test/sourcemaps.scss => browser/devtools/styleinspector/test/doc_sourcemaps.scss
rename : browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.css => browser/devtools/styleinspector/test/doc_style_editor_link.css
rename : browser/devtools/styleinspector/test/test-image.png => browser/devtools/styleinspector/test/doc_test_image.png
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_677930_urls_clickable/browser_styleinspector_bug_677930_urls_clickable.css => browser/devtools/styleinspector/test/doc_urls_clickable.css
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_677930_urls_clickable.html => browser/devtools/styleinspector/test/doc_urls_clickable.html
2014-04-08 12:19:24 +02:00
Patrick Brosset
3fb9725f38 Bug 988313 - Split some of the longer devtools/styleinspector tests. r=miker
--HG--
rename : browser/devtools/styleinspector/test/browser_ruleview_ui.js => browser/devtools/styleinspector/test/browser_ruleview_edit.js
2014-04-08 12:19:21 +02:00
Patrick Brosset
eecf1172da Bug 988313 - Rewrite all devtools/styleinspector tests to be shorter, less prone to failures and more consistent. r=miker 2014-04-08 12:19:16 +02:00
Alexandre Poirot
21876b71a3 Bug 993101 - Add main-process debug button. r=paul 2014-04-08 14:13:09 -04:00
Margaret Leibovic
ca5c8f2349 Bug 991705 - Default to puzzle icon if an add-on doesn't have an icon. r=bnicholson 2014-04-08 11:13:31 -07:00
Ryan VanderMeulen
f90e7f054f Backed out changeset 27a904e6348f (bug 990259) for suspicion of causing Android 4.0 robocop-2 permafail. 2014-04-08 13:49:57 -04:00
Gabriele Svelto
8d98a37cb2 Bug 988760 - Account extra time since blocking correctly. r=karlt 2014-04-07 13:20:57 +02:00
Carsten "Tomcat" Book
f09faa0af3 Merge m-c to b2g-inbound 2014-04-08 15:45:08 +02:00
Carsten "Tomcat" Book
c4ca5079f9 merge b2g-inbound to mozilla-central 2014-04-08 15:34:07 +02:00
Carsten "Tomcat" Book
e2242cf77c merge fx-team to mozilla-central 2014-04-08 15:33:02 +02:00
B2G Bumper Bot
9d1c7bb748 Bumping manifests a=b2g-bump 2014-04-08 04:22:50 -07:00
B2G Bumper Bot
b43d32fb60 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4ff33728b950
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #18065 from rnowm/followup_992771

Bug 993304 - [Follow up] [VRD][Homescreen] use new Buttons and Inputs [BB] r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/39dce89ea2b2
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 993304 - [Follow up] [VRD][Homescreen] use new Buttons and Inputs [BB]
2014-04-08 04:21:11 -07:00
B2G Bumper Bot
ef2f8e2067 Bumping manifests a=b2g-bump 2014-04-08 03:57:50 -07:00
B2G Bumper Bot
9c374dd9ba Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/48c3449cd63e
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #17688 from elefant/bug/980814

Bug 980814 - Set system message handler when the test app is completely loaded.

========

https://hg.mozilla.org/integration/gaia-central/rev/529830401243
Author: hchang <hchang@mozilla.com>
Desc: Bug 980814 - Set system message handler when the test app is completely loaded.
2014-04-08 03:56:12 -07:00
B2G Bumper Bot
988ebee4e8 Bumping manifests a=b2g-bump 2014-04-08 03:21:18 -07:00
B2G Bumper Bot
334570016a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b24c2d662eb1
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17941 from kombuta/master

Bug 976576 - [DSDS][SIM Manager] Change the title text for "Data" CTA r=crh0716

========

https://hg.mozilla.org/integration/gaia-central/rev/f01fcc311064
Author: Lancelot Nyachoto <lancelot@quantum.com.na>
Desc: Bug 976576 - [DSDS][SIM Manager] Change the title text for "Data" CTA
  Change the description
  from "Internet connection, MMS, A-GPS and Marketplace payments will be sent from"
  to   "Data service network and Marketplace payments"

  Added a unique string id "sim-manager-outgoing-data-description"
2014-04-08 03:16:20 -07:00
B2G Bumper Bot
0122be70f6 Bumping manifests a=b2g-bump 2014-04-08 02:56:20 -07:00
B2G Bumper Bot
86575e19c2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4e2a12df2731
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #18038 from rnowm/992863

Bug 992863 - [BB] update Input focus state r=pivanov

========

https://hg.mozilla.org/integration/gaia-central/rev/e81dc47a2496
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 992863 - [BB] update Input focus state
2014-04-08 02:50:55 -07:00
Asaf Romano
162588a904 Bug 993274 - Remove cmd_new:livemark. r=mak 2014-04-08 12:05:26 +03:00
Asaf Romano
ab2c95ce76 Fix for the patch checked in for bug 983623 - Don't import PlacesUtils twice. 2014-04-08 11:50:33 +03:00
Asaf Romano
65a7a1ca10 Bug 983623 - Implement cmd_un/redo for the new async TM. r=mak 2014-04-08 11:42:06 +03:00
B2G Bumper Bot
9c48cd6279 Bumping manifests a=b2g-bump 2014-04-08 01:36:23 -07:00
B2G Bumper Bot
3c0817b745 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e997c9b80ced
Author: Luke Chang <lchang@mozilla.com>
Desc: Merge pull request #18020 from luke-chang/992338_bengali_failed_on_eme

Bug 992338 - [B2G][Tarako][Everything.me] The first Bengali keyboard is not working correctly in the everything.me search bar, r=rudylu

========

https://hg.mozilla.org/integration/gaia-central/rev/fce4d2833c84
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 992338 - [B2G][Tarako][Everything.me] The first Bengali keyboard is not working correctly in the everything.me search bar
2014-04-08 01:31:11 -07:00
B2G Bumper Bot
ca5309ae43 Bumping manifests a=b2g-bump 2014-04-08 00:41:24 -07:00
B2G Bumper Bot
25bbf96f9d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/82aa7db46a22
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #17629 from RudyLu/keyboard/Bug956175-switch_language

Bug 956175 - [keyboard refactor] handle language switching.
r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/2a7bb3d14e82
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 956175 - [keyboard refactor] handle language switching.
 - Add KeyboardLayoutManager, load layout definition file dynamically.
 - Change the format of layout definition from js to json.
 - Add unit tests.
2014-04-08 00:36:33 -07:00
Thomas Zimmermann
0ed53b3260 Bug 990984: Explicitly close socket file descriptor, r=kyle
Closing the socket explicitly will make UnixSocket fail
if we're trying to read or write afterwards; indicating
potential bugs.
2014-04-08 09:30:58 +02:00
Thomas Zimmermann
08e178ea84 Bug 981239: Use atomic ref-counting for |UnixSocketConsumer|, r=kyle
|SocketSendTask| acquires a reference to |UnixSocketConsumer| on
the main thread and releases this reference on the I/O thread;
leading to race-conditions. This patch adds

  - atomicity for ref-counting of |UnixSocketConsumer|, and
  - stricter tests in the destructor of this class.
2014-04-08 09:27:47 +02:00
B2G Bumper Bot
053b6c1d5d Bumping manifests a=b2g-bump 2014-04-08 00:16:32 -07:00
B2G Bumper Bot
9a4aa7432b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/451250fa7e7c
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17952 from rnowm/989933

Bug 989933 - Create green themed header [BB] for comms apps r=pivanov

========

https://hg.mozilla.org/integration/gaia-central/rev/08ef8aad0ec8
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 989933 - Create green themed header [BB] for comms apps
2014-04-08 00:11:10 -07:00
B2G Bumper Bot
60498265f1 Bumping manifests a=b2g-bump 2014-04-07 23:22:43 -07:00
Phil Ringnalda
d165933740 Back out a28cd2a8b397 (bug 992105) for Windows build bustage 2014-04-07 22:42:19 -07:00
Fredrik Lanker
ed70b9c507 Bug 985481 - Make sure that a supported video size is set. r=mikeh 2014-04-08 00:21:00 +02:00
B2G Bumper Bot
29769feba9 Bumping manifests a=b2g-bump 2014-04-08 00:53:02 -07:00
B2G Bumper Bot
4a5a500dfd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3af4c3fce908
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #18061 from snowmantw/issue992281

Bug 992281 - [B2G][Dialer] When a call is ended while the proximity sensor is covered device will return to lockscreen

========

https://hg.mozilla.org/integration/gaia-central/rev/141fe467558b
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 992281 - [B2G][Dialer] When a call is ended while the proximity sensor is covered device will return to lockscreen
2014-04-08 00:51:17 -07:00
Robin Ricard
fcd12f6783 Bug 990259 - Double-tap zoom does not work when text reflow is enabled. r=margaret.leibovic
Fix regression introduced in 958111
2014-04-07 15:37:00 +02:00
Heiher
22d2b7e0fc Bug 992613 - Fix up branding files missing for gtk3 widget toolkit when using aurora or official branding. r=gijs 2014-04-05 20:52:00 +01:00
Bevis Tseng
e5b8117321 Bug 990918 - Part 2: Add Xpcshell Test Case for setCellBroadcastSearchList(). r=htsai 2014-04-03 16:46:51 +08:00
Bevis Tseng
c95434d69d Bug 990918 - Part 1: Make RIL compatible for both new/old formats of ril.cellbroadcast.searchlist. r=htsai 2014-04-03 16:33:56 +08:00
B2G Bumper Bot
445a3e659c Bumping manifests a=b2g-bump 2014-04-07 21:06:25 -07:00
B2G Bumper Bot
aee8dd24c0 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ee2b3048ba1e
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #17950 from mcav/stopwatch-l10n

Bug 988057 - [Stopwatch][l10n] Localization of stopwatch is broken. r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/1ce72ce5ed12
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 988057 - [Stopwatch][l10n] Localization of stopwatch is broken.
2014-04-07 21:01:11 -07:00
Ryan VanderMeulen
a327dec26a Merge m-c to b2g-inbound. 2014-04-07 22:39:09 -04:00
Ryan VanderMeulen
4aa2d3dc0f Merge b2g-inbound to m-c. 2014-04-07 22:29:35 -04:00