Sebastian Hengst 
								
							 
						 
						
							
							
							
							
								
							
							
								24761c4c2a 
								
							 
						 
						
							
							
								
								Bug 1280775 - null check in removePermission to prevent crash: permission manager change. r=mystor  
							
							... 
							
							
							
							MozReview-Commit-ID: 1E67oEULEcs
--HG--
extra : rebase_source : 38df1862f185e263175f0f8487fbb9ceca795d68 
							
						 
						
							2016-06-22 21:07:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wes Kocher 
								
							 
						 
						
							
							
							
							
								
							
							
								1c8f6396c3 
								
							 
						 
						
							
							
								
								Merge m-c to autoland, a=merge  
							
							
							
						 
						
							2016-09-02 13:34:45 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steve Chung 
								
							 
						 
						
							
							
							
							
								
							
							
								1ea8e5606c 
								
							 
						 
						
							
							
								
								Bug 1288557 - Part 1: Replace custom exceptions dialog with usage of permissions. r=MattN  
							
							... 
							
							
							
							MozReview-Commit-ID: 25fD9IJIVt0
--HG--
extra : rebase_source : 883976c1311db15d96bd6100e07f0ea09f576df5 
							
						 
						
							2016-08-30 16:53:03 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrea Marchesini 
								
							 
						 
						
							
							
							
							
								
							
							
								864b069141 
								
							 
						 
						
							
							
								
								Bug 1288029 - Close container tabs when Containers are disabled from about:preferences, r=gijs  
							
							
							
						 
						
							2016-08-23 11:19:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claas Augner 
								
							 
						 
						
							
							
							
							
								
							
							
								5fd7c05de8 
								
							 
						 
						
							
							
								
								Bug 1291835 - Prevent last search engine from being removed. r=florian  
							
							
							
						 
						
							2016-08-18 20:42:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wes Kocher 
								
							 
						 
						
							
							
							
							
								
							
							
								221a8574f7 
								
							 
						 
						
							
							
								
								Merge m-c to fx-team, a=merge  
							
							
							
						 
						
							2016-08-18 16:33:20 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joseph Yeh 
								
							 
						 
						
							
							
							
							
								
							
							
								d06b5432a5 
								
							 
						 
						
							
							
								
								Bug 1036815 - Convert Advanced pane dialogs to be in-content. r=MattN  
							
							... 
							
							
							
							MozReview-Commit-ID: BXeCOryk4kE 
							
						 
						
							2016-08-17 02:08:00 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wes Kocher 
								
							 
						 
						
							
							
							
							
								
							
							
								66098b3d43 
								
							 
						 
						
							
							
								
								Merge m-c to autoland, a=merge  
							
							
							
						 
						
							2016-08-17 17:25:57 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wes Kocher 
								
							 
						 
						
							
							
							
							
								
							
							
								f90f3d11fd 
								
							 
						 
						
							
							
								
								Merge m-c to fx-team, a=merge  
							
							... 
							
							
							
							a=release for the webidl hook due to comment-only changes
--HG--
extra : amend_source : d988a8a774085539988d1d964c4beb2d07eecb50 
							
						 
						
							2016-08-16 22:09:34 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jared Wein 
								
							 
						 
						
							
							
							
							
								
							
							
								ea0b3d77bc 
								
							 
						 
						
							
							
								
								Bug 1294542 - Enable the block-spacing rule for eslint. r=felipe  
							
							... 
							
							
							
							MozReview-Commit-ID: GDfvwWRLNm5 
							
						 
						
							2016-08-16 21:27:37 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sebastian Hengst 
								
							 
						 
						
							
							
							
							
								
							
							
								c66c2fee3a 
								
							 
						 
						
							
							
								
								Backed out changeset 7914e9dc6f88 (bug 1294542) for xpcshell failure in test_Log.js. r=backout  
							
							
							
						 
						
							2016-08-17 01:24:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jared Wein 
								
							 
						 
						
							
							
							
							
								
							
							
								e6276ea7f5 
								
							 
						 
						
							
							
								
								Bug 1294547 - Enable the comma-spacing rule for eslint. r=felipe  
							
							... 
							
							
							
							MozReview-Commit-ID: RCSDEvvk2I 
							
						 
						
							2016-08-16 15:44:15 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jared Wein 
								
							 
						 
						
							
							
							
							
								
							
							
								b82aa6f6de 
								
							 
						 
						
							
							
								
								Bug 1294542 - Enable the block-spacing rule for eslint. r=felipe  
							
							... 
							
							
							
							MozReview-Commit-ID: AAXqh63QNv3 
							
						 
						
							2016-08-16 15:44:13 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jared Wein 
								
							 
						 
						
							
							
							
							
								
							
							
								d181ed5303 
								
							 
						 
						
							
							
								
								Bug 1294531 - Use a className instead of an ID to alter the state of the search engine list to allow add-ons to add their own buttons to the page and choose the behavior that they want. r=Gijs  
							
							... 
							
							
							
							MozReview-Commit-ID: 78VufTvjYVC
--HG--
extra : rebase_source : 5e5e2aa646a9c010ac2ad6683734173b3508ea31 
							
						 
						
							2016-08-13 22:15:58 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jared Wein 
								
							 
						 
						
							
							
							
							
								
							
							
								8d45b8762e 
								
							 
						 
						
							
							
								
								Bug 1294989 - Enable eslint for browser/components/preferences. r=Gijs  
							
							... 
							
							
							
							MozReview-Commit-ID: 62ymdZhluHx
--HG--
extra : rebase_source : 330d512f91d840a47e48f39c21d70d13b2953d2d 
							
						 
						
							2016-08-13 21:58:42 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lee Salzman 
								
							 
						 
						
							
							
							
							
								
							
							
								6869b3965f 
								
							 
						 
						
							
							
								
								Bug 1259384 - request longer timeout in browser_privacypane_4.js mochitest. r=ehsan  
							
							... 
							
							
							
							MozReview-Commit-ID: 7RBqq0XUbaR 
							
						 
						
							2016-08-11 13:07:17 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jared Wein 
								
							 
						 
						
							
							
							
							
								
							
							
								e1991e575b 
								
							 
						 
						
							
							
								
								Bug 1238065 - Fix the todo in escape_should_close_dialog by using synthesizeKey instead of sendChar. r=mikedeboer  
							
							... 
							
							
							
							MozReview-Commit-ID: 7Kp1B7RCLKH
--HG--
extra : rebase_source : 11c31ab6386abf24276a7b90716533520d6cdcd8 
							
						 
						
							2016-08-13 23:28:46 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fischer.json 
								
							 
						 
						
							
							
							
							
								
							
							
								8d2008a370 
								
							 
						 
						
							
							
								
								Bug 1037166 - Convert the "Show Update History" dialog on advanced pane to be in-content.r=jaws  
							
							... 
							
							
							
							MozReview-Commit-ID: kmgB4Sv9KM
--HG--
extra : rebase_source : 8b7edf6c5688321df05f83e7876ae3bb6b09e214 
							
						 
						
							2016-07-29 17:03:05 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fischer.json 
								
							 
						 
						
							
							
							
							
								
							
							
								82923f20db 
								
							 
						 
						
							
							
								
								Bug 1169704 - In-content preferences - Search tab - "One-click search engines" table remains highlighted after clicking elsewhere on the page, r=jaws  
							
							... 
							
							
							
							MozReview-Commit-ID: 2Tbzr0wSpv1 
							
						 
						
							2016-07-26 18:12:42 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Dão Gottwald 
								
							 
						 
						
							
							
							
							
								
							
							
								ad6ac078ce 
								
							 
						 
						
							
							
								
								Bug 1116787 - Expose preference for having Ctrl+Tab cycle through tabs in recently used order. ui-r=phlsa r=mikedeboer  
							
							
							
						 
						
							2016-07-27 17:04:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tom Tromey 
								
							 
						 
						
							
							
							
							
								
							
							
								5538d692d3 
								
							 
						 
						
							
							
								
								Bug 1286877 - do not set c-basic-offset for python-mode; r=gps  
							
							... 
							
							
							
							This removes the unnecessary setting of c-basic-offset from all
python-mode files.
This was automatically generated using
    perl -pi -e 's/; *c-basic-offset: *[0-9]+//'
... on the affected files.
The bulk of these files are moz.build files but there a few others as
well.
MozReview-Commit-ID: 2pPf3DEiZqx
--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204 
							
						 
						
							2016-07-14 10:16:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrea Marchesini 
								
							 
						 
						
							
							
							
							
								
							
							
								aa4cf8af1e 
								
							 
						 
						
							
							
								
								Bug 1287765 - Add 'learn more' in about:preferences for Containers, r=gijsm r=flod  
							
							
							
						 
						
							2016-07-20 11:53:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrea Marchesini 
								
							 
						 
						
							
							
							
							
								
							
							
								dbd1a56877 
								
							 
						 
						
							
							
								
								Bug 1279029 - part 2 - removed 'learn more' for Containers, r=gijs  
							
							
							
						 
						
							2016-07-19 16:30:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrea Marchesini 
								
							 
						 
						
							
							
							
							
								
							
							
								2e55fe0b18 
								
							 
						 
						
							
							
								
								Bug 1279029 - part 1 - Containers in preferences, r=gijs  
							
							
							
						 
						
							2016-07-19 16:29:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Carsten "Tomcat" Book 
								
							 
						 
						
							
							
							
							
								
							
							
								c735a88756 
								
							 
						 
						
							
							
								
								Merge mozilla-central to fx-team  
							
							
							
						 
						
							2016-07-17 10:10:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pushpankar 
								
							 
						 
						
							
							
							
							
								
							
							
								c6670d980f 
								
							 
						 
						
							
							
								
								Bug 1286854 - Replace ownerDocument.defaultView with ownerGlobal in browser/. r=dao  
							
							... 
							
							
							
							--HG--
extra : rebase_source : 72d50e73baf595840a2aade57ae782e4c40d4c27 
							
						 
						
							2016-07-16 10:20:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Milan Sreckovic 
								
							 
						 
						
							
							
							
							
								
							
							
								6931480ab1 
								
							 
						 
						
							
							
								
								Bug 1285328: Part 2. Add an ability to change the revert/cancel label and/or show the restart later button to the confirmRestartPrompt dialog. r=jaws  
							
							... 
							
							
							
							MozReview-Commit-ID: D7SDsHqghAS
--HG--
extra : rebase_source : fedeab9570c20aadb4910acd34ea26ed1474c95c 
							
						 
						
							2016-07-14 14:14:28 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Milan Sreckovic 
								
							 
						 
						
							
							
							
							
								
							
							
								6b06d7aedd 
								
							 
						 
						
							
							
								
								Bug 1285328: Part 1. Make sure the first button/escape is a no-op in these dialogs, and in the potential data loss case, make the default also a no-op. Refactor some common code into preferences.js.  r=jaws  
							
							... 
							
							
							
							MozReview-Commit-ID: 576kGMX08vz
--HG--
extra : rebase_source : d7459ddff9655005eee46ced6cd8ca3d01158038 
							
						 
						
							2016-07-14 13:55:07 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jared Wein 
								
							 
						 
						
							
							
							
							
								
							
							
								c72dd2013f 
								
							 
						 
						
							
							
								
								Bug 1278844 - Disable the Download Folder and Choose Folder elements if the browser.download.useDownloadDir pref is locked. r=MattN  
							
							... 
							
							
							
							MozReview-Commit-ID: 7biIaukj7Fp
--HG--
extra : rebase_source : 2cd19e9c060b5b7f6fc36e3afa9763383491e877 
							
						 
						
							2016-07-07 14:31:05 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gijs Kruitbosch 
								
							 
						 
						
							
							
							
							
								
							
							
								efe8df2600 
								
							 
						 
						
							
							
								
								Bug 1280472 - fix focusing of text links in about:preferences, r=dao  
							
							... 
							
							
							
							MozReview-Commit-ID: 2lPFDTYVY99
--HG--
extra : rebase_source : b1b76a1aadf80cbe9a6d4f427a709046bf8eeffd
extra : source : d724f337b4f05a56fe90f05ccff06d09a3631eee 
							
						 
						
							2016-06-22 18:57:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Milan Sreckovic 
								
							 
						 
						
							
							
							
							
								
							
							
								61f06dcc3f 
								
							 
						 
						
							
							
								
								Bug 1282537: Better wording for the E10S restart required confirm box. r=jimm  
							
							... 
							
							
							
							MozReview-Commit-ID: sHQUi8Ec2L
--HG--
extra : rebase_source : 05d29a147f72174a9c8562d4d5dd7876a86b0fa9 
							
						 
						
							2016-06-27 14:38:50 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gijs Kruitbosch 
								
							 
						 
						
							
							
							
							
								
							
							
								ef400acc5c 
								
							 
						 
						
							
							
								
								Backed out changeset d724f337b4f0 (bug 1280472) for not working correctly (opening spurious new tabs), see bug 1282794  
							
							... 
							
							
							
							MozReview-Commit-ID: IHDvXQAhs5j
--HG--
extra : amend_source : 9b412eb6eb3a73178efbe2e8a5c8b4efc820fbb9 
							
						 
						
							2016-06-28 17:19:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Nguyen 
								
							 
						 
						
							
							
							
							
								
							
							
								ffba687a20 
								
							 
						 
						
							
							
								
								Bug 1025965 - Rename browser.safebrowsing.enabled to browser.safebrowsing.phishing.enabled. r=francios  
							
							... 
							
							
							
							MozReview-Commit-ID: 3TMs6MPtWsC 
							
						 
						
							2016-05-09 14:44:08 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gijs Kruitbosch 
								
							 
						 
						
							
							
							
							
								
							
							
								667d9f2396 
								
							 
						 
						
							
							
								
								Bug 1280472 - fix focusing of text links in about:preferences, r=jaws  
							
							... 
							
							
							
							MozReview-Commit-ID: 2lPFDTYVY99
--HG--
extra : rebase_source : a551914a77e6af025382b867a5c289329caa6073 
							
						 
						
							2016-06-22 18:57:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claas Augner 
								
							 
						 
						
							
							
							
							
								
							
							
								bb8214349a 
								
							 
						 
						
							
							
								
								Bug 1264475 - Allow removal of search engines using keyboard shortcuts. r=florian  
							
							
							
						 
						
							2016-06-15 00:10:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Florian Quèze 
								
							 
						 
						
							
							
							
							
								
							
							
								225ca7a439 
								
							 
						 
						
							
							
								
								Bug 1260820 - Search engine drop down closes when I change search engines by pressing Up/Down, r=Gijs.  
							
							
							
						 
						
							2016-06-10 09:55:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jared Wein 
								
							 
						 
						
							
							
							
							
								
							
							
								60a875da64 
								
							 
						 
						
							
							
								
								Bug 1275089 - Wrap the call to getHistogramById().add() in a try/catch since the probe expires in v50 and the histogram is no longer reported as a COUNT histogram since it is expired. Histograms that are not COUNT histograms must supply a value when calling .add(). r=Gijs  
							
							... 
							
							
							
							MozReview-Commit-ID: C4x6dR1nULR
--HG--
extra : rebase_source : c4442b1cf50683dec47343299e86b9ef0a5df10a 
							
						 
						
							2016-05-27 13:43:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gasolin 
								
							 
						 
						
							
							
							
							
								
							
							
								208ab94666 
								
							 
						 
						
							
							
								
								Bug 1174900 - Capture doorhanger password field toggle should stay hidden for master password users;r=MattN  
							
							... 
							
							
							
							MozReview-Commit-ID: DLlu2WhQamN
--HG--
extra : rebase_source : 9ed3a080a6783d5942b9068005718bbe2e74bf32 
							
						 
						
							2016-06-06 18:50:09 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wes Kocher 
								
							 
						 
						
							
							
							
							
								
							
							
								c8fda3aef7 
								
							 
						 
						
							
							
								
								Bug 1278388 - skip browser_permissions_urlFieldHidden.js because changing to firefox50 broke it a=test-only  
							
							
							
						 
						
							2016-06-06 14:46:13 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Carsten "Tomcat" Book 
								
							 
						 
						
							
							
							
							
								
							
							
								71eb3110f9 
								
							 
						 
						
							
							
								
								merge mozilla-inbound to mozilla-central a=merge  
							
							
							
						 
						
							2016-06-03 12:00:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Edouard Oger 
								
							 
						 
						
							
							
							
							
								
							
							
								a58b0d4db3 
								
							 
						 
						
							
							
								
								Bug 1275383 - Change the copy of Sync disconnection warning. r=markh  
							
							... 
							
							
							
							MozReview-Commit-ID: 6WuxnRaYo7X
--HG--
extra : transplant_source : %BD%FE%F8%FD%AA%40%CF%97%B8M%D7%7Fm%9Aq%F9%BEhX%AB 
							
						 
						
							2016-06-01 16:41:31 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Edouard Oger 
								
							 
						 
						
							
							
							
							
								
							
							
								e2bf4faffe 
								
							 
						 
						
							
							
								
								Bug 1275915 - Replace sync verification panel with platform notification. r=markh  
							
							... 
							
							
							
							MozReview-Commit-ID: CrGGBplrHPI
--HG--
extra : transplant_source : KE%7B%7D%0C%16%40%1D%5E%B2%A6%257%9F%0B%C8%254%A99 
							
						 
						
							2016-05-31 14:52:11 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felipe Gomes 
								
							 
						 
						
							
							
							
							
								
							
							
								918237b0ca 
								
							 
						 
						
							
							
								
								Bug  1227230 - Remove all of the e10s prompting code. r=jimm  
							
							... 
							
							
							
							This removes all of the e10s-related prompting code, including:
- doorhanger offering to opt-in into e10s
- pref and telemetry probe used to measure the number of users who remained opted-in
- dialog that shows up when unchecking the e10s checkbox saying that a tab will open, requesting feedback
- tab opening requesting feedback
- all related strings
The checkbox in the preferences window remains (nightly/aurora only), as well as the message saying that e10s requires a restart.
The e10s accessibility doorhanger remains. and chrome://browser/skin/e10s-64@2x.png remains too because it's also used in the a11y doorhanger.
MozReview-Commit-ID: aOdvnbeHOa
--HG--
extra : rebase_source : e89cc42dddcb376bece435138611b364d3477fa8 
							
						 
						
							2016-05-12 20:31:52 -03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francois Marier 
								
							 
						 
						
							
							
							
							
								
							
							
								0365bcf354 
								
							 
						 
						
							
							
								
								Bug  1277378 - Fix typo in Safe Browsing in-content preferences. r=past  
							
							... 
							
							
							
							MozReview-Commit-ID: KfZpVRWuzjV
--HG--
extra : rebase_source : 75e64eff52936c3c94eee9730b3d69f748b0c236 
							
						 
						
							2016-06-01 16:35:48 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marco Bonardo 
								
							 
						 
						
							
							
							
							
								
							
							
								06932c74d1 
								
							 
						 
						
							
							
								
								Bug 1223728 - Remove the unifiedcomplete pref, the urlinline component and stop bundling the old autocomplete component in Firefox. r=adw  
							
							... 
							
							
							
							MozReview-Commit-ID: Ee08mDGxBjJ
--HG--
extra : rebase_source : 4473da657f85e443e5095b43b3e774e85292ecd1
extra : amend_source : c9c322ebae255a24c28e6367b9fe93474db21d6d 
							
						 
						
							2016-05-05 00:14:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gasolin 
								
							 
						 
						
							
							
							
							
								
							
							
								51fda07150 
								
							 
						 
						
							
							
								
								Bug 1228258 - Search aliases should be trimmed. r=mak  
							
							... 
							
							
							
							MozReview-Commit-ID: CzTU7aBnIRd
MozReview-Commit-ID: 2OzxRTtr39b
--HG--
extra : transplant_source : y%3DQ%03%D7%BA%F7%8B%92/%FB%26%E1jP%E9%ECI%DD%EB 
							
						 
						
							2016-04-25 15:19:36 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Carsten "Tomcat" Book 
								
							 
						 
						
							
							
							
							
								
							
							
								3db7c01bb7 
								
							 
						 
						
							
							
								
								Merge mozilla-central to fx-team  
							
							
							
						 
						
							2016-05-04 12:01:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ryan Hankins 
								
							 
						 
						
							
							
							
							
								
							
							
								db6d36f08c 
								
							 
						 
						
							
							
								
								Bug 1268848 - Safe Browsing preferences graying out inconsistency. r=gpascutto  
							
							
							
						 
						
							2016-05-03 11:34:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Milan Sreckovic 
								
							 
						 
						
							
							
							
							
								
							
							
								d271f80d7b 
								
							 
						 
						
							
							
								
								Bug 973014: Restart due to privacy setting change now has better button labels than OK and Cancel. r=past  
							
							... 
							
							
							
							MozReview-Commit-ID: Jbcs59D3Apf
--HG--
extra : rebase_source : 9ff585d6f57600bde9eda4f046c568a720457e5f 
							
						 
						
							2016-04-29 13:25:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Wes Kocher 
								
							 
						 
						
							
							
							
							
								
							
							
								56fe7c4bcb 
								
							 
						 
						
							
							
								
								Merge m-c to fx-team a=merge  
							
							... 
							
							
							
							MozReview-Commit-ID: 3H9BxQQQnNI 
							
						 
						
							2016-04-29 16:05:30 -07:00