Commit Graph

21684 Commits

Author SHA1 Message Date
Blair McBride
106acc1ae7 Bug 1073846 - Wrong URL loads after autofill of a hostname that matches a search engine. r=mak
--HG--
extra : transplant_source : %ABR%7F%94S%92%FD%B5%0B%1D%2B%CBc%7D-%7B%F6%D0%0C%13
2014-09-30 15:04:58 +13:00
David Rajchenbach-Teller
3f2ecbbb0e Bug 1069577 - Transfering values with a PromiseWorker. r=froydnj 2014-10-01 05:28:00 +02:00
Tomasz KoƂodziejski
48bb9265ad Bug 1051187 - "Match case" button does not refresh the number of occurences. r=mikedeboer 2014-09-26 14:34:00 +02:00
Manu Jain
506bcc8526 Bug 1065925 - Remove code for expiring Places telemetry probes. r=mak 2014-09-30 08:54:00 +02:00
J. Ryan Stinnett
b9fcf93f2f Bug 916804 - Telemetry for WebIDE. r=mratcliffe,paul 2014-10-01 16:04:00 +02:00
Nick Fitzgerald
57389cd7e9 Bug 915426 - Don't store debugging data in the global scope. r=ejpbruel 2014-10-01 07:45:00 +02:00
Carsten "Tomcat" Book
09f71bfe25 Backed out changeset 01a525d9c6c2 (bug 1073846) for suspicion of causing dt1 test failures 2014-10-02 15:48:04 +02:00
Irving Reid
c4be677020 Bug 1074135 - callback after exceptions when calling async provider methods; r=unfocused 2014-09-29 13:01:50 -04:00
Carsten "Tomcat" Book
b09e5bc437 merge fx-team to mozilla-central a=merge 2014-10-01 14:59:31 +02:00
Carsten "Tomcat" Book
a186f7432f merge mozilla-inbound to mozilla-central a=merge 2014-10-01 14:51:20 +02:00
Robert Strong
0c664e2bec Mac v2 signing - Bug 1075169 - Copy staged update when renaming fails and fix crash on staging failure. r=spohl, a=RyanVM over irc 2014-09-30 20:36:45 -07:00
Wes Kocher
bf97099d0a Merge fx-team to m-c a=merge 2014-09-30 16:55:14 -07:00
Wes Kocher
208f0626df Merge m-c to fx-team a=merge 2014-09-30 17:13:45 -07:00
Shane Caraveo
54bd7f2017 Bug 1073863 use origin in activation panel rather than name, r=markh 2014-09-30 17:08:42 -07:00
Neil Deakin
424e165e6b Bug 1071771, disable dictionary list when it cannot be accessed from another process. This makes the context menu work again after using it on a misspelled word, r=mconley 2014-09-30 12:05:53 -04:00
Gijs Kruitbosch
40e0ffedb1 Bug 1072992 - fix update button text color on OS X Yosemite to use ButtonText, r=dao 2014-09-30 16:46:04 +01:00
Ed Morley
4052c38b89 Backed out changeset 0ec9bd8e9880 (bug 1044020) for asan failures 2014-09-30 17:35:44 +01:00
Manu Jain
0af2e1be87 Bug 1065285 - Add telemetry for the last maintenance time. r=mak 2014-09-27 03:47:00 -04:00
David Rajchenbach-Teller
28d377e982 Bug 1044020 - Add the duration of shutdown phases to Telemetry. r=froydnj 2014-09-30 11:43:46 +02:00
Carsten "Tomcat" Book
79db3ead60 Merge m-c to fx-team 2014-09-30 15:38:31 +02:00
Carsten "Tomcat" Book
3d0ce0976d merge fx-team to mozilla-central a=merge 2014-09-30 15:10:47 +02:00
Julian Viereck
6c1f064ca0 Bug 950797 - Use result from last completion in nsAutoCompleteController to reduce autoFill UI flickering until search results come back. r=mak 2014-09-30 04:14:49 -07:00
Marco Bonardo
164623870f Bug 1067602 - Fix strict warning in UnifiedComplete.js. r=mano 2014-09-30 12:40:26 +02:00
Marco Bonardo
3ae5df3954 Bug 1041433 - UnifiedComplete: Close connections on Sqlite.shutdown.addBlocker. r=mano 2014-09-30 12:40:18 +02:00
Marco Bonardo
fc693610ab Bug 1041428 - Clarify query cancellation in UnifiedComplete.js. r=mano 2014-09-30 12:40:11 +02:00
Brian Grinstead
d0210bbbc5 Bug 920141 - Add support for inspecting anonymous content. r=pbrosset
--HG--
rename : browser/devtools/styleinspector/test/browser_ruleview_pseudo-element.js => browser/devtools/styleinspector/test/browser_ruleview_pseudo-element_01.js
2014-09-29 09:29:00 +02:00
Phil Ringnalda
afb1afe7e4 Backed out 2 changesets (bug 1070778, bug 1073846) for bc1 bustage
Backed out changeset c5f1d81d3849 (bug 1070778)
Backed out changeset b327a052e47f (bug 1073846)

--HG--
extra : rebase_source : 49d62043ba91398f370997868bba693ccc6d8251
2014-09-29 20:34:54 -07:00
Blair McBride
b329a5bcbb Bug 1070778 - Selecting a moz-action: result then typing more can result in "Search X for moz-action:..." item. r=mak
--HG--
extra : transplant_source : P/b%9D%B6T%85%22%A8%1B%F0%18%3A%827%C2qx%F6%97
2014-09-30 13:56:06 +13:00
Blair McBride
858d40f71b Bug 1073846 - Wrong URL loads after autofill of a hostname that matches a search engine. r=mak
--HG--
extra : transplant_source : %D3%25%3F%83R%B7%81%DF%13nZ%1CH%D8B%B10%99%B4%B2
2014-09-30 11:16:48 +13:00
Ryan VanderMeulen
ca7eb1e9fb Merge m-c to fx-team. a=merge 2014-09-29 16:09:22 -04:00
Ryan VanderMeulen
d209ce9389 Merge fx-team to m-c. a=merge 2014-09-29 15:06:48 -04:00
Ed Morley
ad0103637b Backed out changeset 49b1465d3e5e (bug 1044020) for compilation failures 2014-09-29 15:41:54 +01:00
Carsten "Tomcat" Book
b8dfb0bd0b Merge m-c to fx-team 2014-09-29 16:19:41 +02:00
Carsten "Tomcat" Book
04f390a404 merge mozilla-inbound to mozilla-central a=merge 2014-09-29 15:42:55 +02:00
Brian R. Bondy
d0465e893d Bug 958554 - Fix about window sometimes saying nightly is being updatd by another instance. r=rstrong
Note that if the process is hung, or there is another instance running in a  different user instance,
or another profile is running, the message is perfectly normal.  But this should prevent the bad case
of getting this message.

This handling was first added specifically for Metro and Firefox running the same intallation at the
same time.  Metro isn't being released but there are still other very valid reasons for having this
handling as noted above.
2014-09-28 21:26:34 -04:00
Mike Quested
f0ea4a8120 Bug 1056035 - Hide the separator if there are no visible items above it. r=Unfocused 2014-09-29 05:01:00 -04:00
Irving Reid
1a750a0d61 Bug 1059674 - use AsynchShutdown.blocker() for AddonManager provider shutdown; r=unfocused 2014-09-27 16:25:47 -04:00
Carsten "Tomcat" Book
6906d1ae0f Merge m-c to mozilla-inbound 2014-09-29 16:10:39 +02:00
Henri Sivonen
1ebfa4ad7b Bug 964225 - Remove the GBK decoder class and remove GB2312 as a Gecko-canonical encoding. r=emk. 2014-09-26 15:12:02 +03:00
David Rajchenbach-Teller
42346ce81a Bug 1044020 - Add the duration of shutdown phases to Telemetry. r=froydnj 2014-09-25 17:19:34 +02:00
Iaroslav Sheptykin
d5c0411061 Bug 1031298 - Add a histogram for counting unrecoverable sessions. r=yoric 2014-09-25 13:39:00 -04:00
Blair McBride
db53b53c1c Backout 262b6ad34702 (bug 1070778) due to bc1 failures. r=backout 2014-09-30 02:38:29 +13:00
Florian QuĂšze
7938d388b2 Bug 1067367 - tapping the icon of a second doorhanger reopens the first doorhanger if it was already open, r=Enn. 2014-09-29 15:33:34 +02:00
Blair McBride
19fd3187ae Bug 1070778 - Selecting a moz-action: result then typing more can result in "Search X for moz-action:..." item. r=mak
--HG--
extra : transplant_source : %2C%E3F%B4%B9%A9%3A%AD1s%1C%E3Y%C1S%DC%A1%99%DF%C2
2014-09-30 01:49:52 +13:00
Alex Bardas
eb67e9eaca Bug 1071164 - Display magnifying glass for search results in awesomebar (follow-up of bug 1040725). r=Unfocused 2014-09-27 16:58:00 +02:00
Georg Fritzsche
7bf3afe79c Bug 1069873 - Add counter histogram type. r=froydnj 2014-09-26 17:45:33 +02:00
Tim Taubert
f50879194c Backed out changeset c9ef2c9434b5 (bug 1071164) 2014-09-29 02:21:49 -07:00
Alex Bardas
9bd668bd8a Bug 1071164 - Display magnifying glass for search results in awesomebar (follow-up of bug 1040725). r=Unfocused 2014-09-27 16:58:00 +02:00
J. Ryan Stinnett
c9105d54de Bug 1073522 - Better error when front has no actor. r=dcamp 2014-09-26 09:35:00 +02:00
Georg Fritzsche
6f7d27254c Bug 1070036 - Catch NS_ERROR_NOT_AVAILABLE during OpenH264Provider startup. r=irving 2014-09-24 17:38:50 +02:00
Tomasz KoƂodziejski
7f84ec05f4 Bug 1070923 - Fix intermittent test_bug451286.xul by waiting for the highlight toggle to finish. r=mikedeboer
--HG--
extra : rebase_source : 109dcc17a75333f1715e48432893e216e73838fc
2014-09-26 10:49:00 -04:00
Nick Alexander
31a82e2d6c Bug 1064177 - Part 1: Add RestrictedProfiles.DISALLOW_MODIFY_ACCOUNTS. r=wesj
This corresponds to UserManager.DISALLOW_MODIFY_ACCOUNTS.

--HG--
extra : rebase_source : 9a337cf2cb7c3cf6d8ae4c9b9c7a41138651410f
2014-09-26 11:44:55 -07:00
Sudheesh Singanamalla
6291f6cdb0 Bug 1054492: move DirectoryLinksProvider.jsm to browser/ since it's Firefox-specific, r=gavin
--HG--
rename : toolkit/modules/DirectoryLinksProvider.jsm => browser/modules/DirectoryLinksProvider.jsm
rename : toolkit/modules/tests/xpcshell/test_DirectoryLinksProvider.js => browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
2014-09-22 13:23:19 +05:30
Robert Strong
e206e1d442 Mac v2 signing - Bug 1072722 - With older clients the new maintenance service checks the updated directory's updater.exe when verifying the updater.exe for replace requests. r=spohl 2014-09-29 11:53:07 -07:00
Robert Strong
256850ee9c Mac v2 signing - Bug 1072554 - Remove update directories when running xpcshell tests. r=spohl 2014-09-29 11:52:59 -07:00
Robert Strong
d23dd0c344 Mac v2 signing - Bug 1071465 - old precomplete file is not removed on update. r=spohl 2014-09-29 11:52:48 -07:00
Robert Strong
53ad52e471 Mac v2 signing - Bug 1071134 - Fix command line help for updater. r=spohl 2014-09-29 11:52:44 -07:00
Robert Strong
f18e3ae057 Mac v2 signing - Temporary workaround for Bug 1070148 - Copy maintenance service binary into its install directory when the installed binary is different. r=bbondy 2014-09-29 11:52:32 -07:00
Robert Strong
9c32d082f1 Mac v2 signing - Bug 1070661 - Error setting access/modification time on application bundle. r=spohl 2014-09-29 11:52:21 -07:00
Robert Strong
3715196e39 Mac v2 signing - Bug 1068439 - Move the distribution directory from Content/MacOS to Contents/Resources on app update due to v2 signing requirements. r=spohl 2014-09-29 11:52:18 -07:00
Robert Strong
d61019a5de Mac v2 signing - Bug 1058182 - Fix app update xpcshell tests due to the Mac v2 bundle structure. r=bbondy 2014-09-29 11:52:14 -07:00
Robert Strong
cddf6a2d9d Mac v2 signing - Bug 1064523 - Create staging directory outside of the Mac bundle. r=bbondy 2014-09-29 11:52:08 -07:00
Robert Strong
19489bfb24 Mac v2 signing - Bug 1059567 - Packaging changes for the move of removed-files file from Contents/MacOS to Contents/Resources. r=bbondy, r=nthomas
--HG--
rename : tools/update-packaging/test/from-mac/Contents/MacOS/application.ini => tools/update-packaging/test/from-mac/Contents/Resources/application.ini
rename : tools/update-packaging/test/from-mac/Contents/MacOS/distribution/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/from-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/from-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/readme.txt => tools/update-packaging/test/from-mac/Contents/Resources/readme.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/removed.txt => tools/update-packaging/test/from-mac/Contents/Resources/removed.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/same.txt => tools/update-packaging/test/from-mac/Contents/Resources/same.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/searchplugins/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/from-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/update-settings.ini => tools/update-packaging/test/from-mac/Contents/Resources/update-settings.ini
rename : tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/channel-prefs.js => tools/update-packaging/test/from-mac/Contents/Resources/{foodir/channel-prefs.js
rename : tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/force.txt => tools/update-packaging/test/from-mac/Contents/Resources/{foodir/force.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/application.ini => tools/update-packaging/test/to-mac/Contents/Resources/application.ini
rename : tools/update-packaging/test/to-mac/Contents/MacOS/distribution/extensions/added/file.txt => tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/added/file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/distribution/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/extensions/added/file.txt => tools/update-packaging/test/to-mac/Contents/Resources/extensions/added/file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/to-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/readme.txt => tools/update-packaging/test/to-mac/Contents/Resources/readme.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/removed-files => tools/update-packaging/test/to-mac/Contents/Resources/removed-files
rename : tools/update-packaging/test/to-mac/Contents/MacOS/same.txt => tools/update-packaging/test/to-mac/Contents/Resources/same.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/searchplugins/added/file.txt => tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/added/file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/searchplugins/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/update-settings.ini => tools/update-packaging/test/to-mac/Contents/Resources/update-settings.ini
rename : tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/channel-prefs.js => tools/update-packaging/test/to-mac/Contents/Resources/{foodir/channel-prefs.js
rename : tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/force.txt => tools/update-packaging/test/to-mac/Contents/Resources/{foodir/force.txt
2014-09-29 11:52:04 -07:00
Robert Strong
240ce21733 Mac v2 signing - Bug 1059467 - Move precomplete file from the root of the Mac bundle to Contents/Resources. r=bbondy, r=nthomas
--HG--
rename : tools/update-packaging/test/from-mac/precomplete => tools/update-packaging/test/from-mac/Contents/Resources/precomplete
rename : tools/update-packaging/test/to-mac/precomplete => tools/update-packaging/test/to-mac/Contents/Resources/precomplete
2014-09-29 11:51:55 -07:00
Steven Michaud
25e007d56d Mac v2 signing - Bug 1047738 - Make distribution code look for the distribution directory under Contents/Resources due to v2 signing requirements. r=bsmedberg 2014-09-29 11:51:51 -07:00
Stephen Pohl
5781264d40 Mac v2 signing - Bug 1064910 - Update Webapp Runtime to work with the new v2 bundle structure of Firefox on OSX. r=myk 2014-09-29 11:51:43 -07:00
Stephen Pohl
d16e3504d5 Mac v2 signing - Bug 1060562 - Update xpcshell-tests for the new v2 bundle structure on OSX. r=jmaher 2014-09-29 11:51:29 -07:00
Stephen Pohl
953f3dd157 Mac v2 signing - Bug 1055774 - Update lookup for crashreporter.ini for the new v2 bundle structure on OSX. r=bsmedberg 2014-09-29 11:51:13 -07:00
Stephen Pohl
00e9cf9ba0 Mac v2 signing - Bug 1046924 - Move updates directory out of the .app bundle. r=rstrong 2014-09-29 11:51:08 -07:00
Stephen Pohl
dca2016258 Mac v2 signing - Bug 1050944 - Get Firefox to launch and run on OSX with the new .app bundle structure, made necessary by Apple's v2 signatures. r=smichaud, r=ted, sr=bsmedberg 2014-09-29 11:51:04 -07:00
Stephen Pohl
03bdc411e4 Mac v2 signing - Bug 1047584 - Modify the .app file structure to allow for OSX v2 signing. r=bsmedberg 2014-09-29 11:50:56 -07:00
Stephen Pohl
9ddba86a83 Mac v2 signing - Bug 1047584 - Enable DMG v2 signing. r=bhearsum 2014-09-29 11:50:52 -07:00
Tim Taubert
52bfe61f91 Bug 1072198 - updateBrowserRemoteness() needs to keep .permanentKey when updating browsers r=billm 2014-09-24 12:19:46 +02:00
Blair McBride
7f485beb93 Bug 1067899 - Add autocomplete result type for arbitrary URLs. r=mak
--HG--
extra : transplant_source : %B4%5C%83%26%B0%3EL%F1%B0%0E%B4%822y%E5%8B%0B%A4%01%3D
2014-09-27 01:17:25 +12:00
Blair McBride
5544fa5570 Bug 1073358 - Sqlite.jsm should return some measure of what happened regardless of whether a row handler was used. r=mak
--HG--
extra : transplant_source : %09%E7%2B%D3%9F%93Qzw%C4IL%EC%23g%B9o%DB%0D%DE
2014-09-27 01:17:00 +12:00
Carsten "Tomcat" Book
7bcab5f21e merge fx-team to mozilla-central a=merge 2014-09-26 13:27:36 +02:00
Mark Hammond
197190035c Bug 1073359 - reinstate PermissionUtils and XPIProvider which were removed in bug 1050080. r=MattN 2014-09-26 15:54:34 +10:00
Mark Hammond
8a6117812d Bug 932651 - getClipboardData in specialpowersAPI uses the chrome window so it works in e10s. r=ted 2014-09-26 14:03:41 +10:00
Blair McBride
5fc84319e1 Bug 1067896 - Add autocomplete result type for searching via alias of a search engine. r=mak
--HG--
extra : transplant_source : %16%CB%E8%D5%3F%3D%B6%2C%90%1F%0F4%0B%1C%ED%DFvC%F1%28
2014-09-26 15:32:07 +12:00
Blair McBride
432060b95a Bug 1067888 - Add autocomplete result type for searching via current search engine. r=mak
--HG--
rename : toolkit/components/places/tests/unifiedcomplete/test_searchEngine.js => toolkit/components/places/tests/unifiedcomplete/test_searchEngine_restyle.js
extra : transplant_source : n%86%86%E2%23%85d%15%A8%0D%DD%F0%9A%A4%8B%E8y-%3DY
2014-09-25 17:04:06 +12:00
Ryan VanderMeulen
0d3647a0ea Merge m-c to fx-team. a=merge 2014-09-25 16:57:55 -04:00
Dave Camp
17126245a3 Bug 1072632 - Re-export emit from protocol.js. r=past 2014-09-25 12:22:41 -07:00
Dave Camp
1f422d68ee Bug 1052074 - Improve error messages for protocol.js exceptions. r=jsantell 2014-09-25 12:22:41 -07:00
Tom Tromey
75d7f7f7fc Bug 1072932 - Hoist "let"s to avoid the TDZ. r=past 2014-09-25 06:54:00 -04:00
Guilherme Goncalves
ba5a5d7a48 Bug 1071976 - Use js_calloc for allocating ArrayBufferContents objects. r=Yoric
--HG--
extra : rebase_source : c3ad82ebe6e12e3340e6564833cc2e5524b900dd
2014-09-23 15:23:00 -04:00
Carsten "Tomcat" Book
47a46e4e78 merge fx-team to mozilla-central a=merge 2014-09-25 14:35:17 +02:00
Carsten "Tomcat" Book
1c5db41dcc merge mozilla-inbound to mozilla-central a=merge 2014-09-25 14:22:30 +02:00
Nicholas Nethercote
35839ffcae Bug 1070251 - Anonymize non-chrome inProcessTabChildGlobal URLs in memory reports when necessary. r=khuey.
--HG--
extra : rebase_source : a204dbae9f853be3ade1cdebfa0f4ac01fa3a174
2014-09-24 19:08:20 -07:00
Tim Taubert
b4218ed34c Bug 998267 - Don't always show the throbber when opening new tabs in e10s r=billm 2014-09-25 05:34:47 +02:00
Mark Hammond
63db2ab5ca Bug 1072141 - get browser/devtools/webaudioeditor tests passing in e10s. r=pbrosset 2014-09-25 12:23:39 +10:00
Ed Lee
30b7898046 Bug 1059591 - Incorrectly formatted remotely hosted links causes new tab to be empty [r=adw]
Use catch handler of promises to default to empty array on exceptions.
2014-09-23 15:12:20 -07:00
Ryan VanderMeulen
2d2336f54b Merge m-c to fx-team. a=merge 2014-09-24 17:13:47 -04:00
Ryan VanderMeulen
72911fffa8 Merge m-c to inbound. a=merge
CLOSED TREE
2014-09-24 16:08:33 -04:00
Ben Craddock
ae1064de91 Bug 1072193 - Hide video controls when mouse leaves from the left or right. r=dolske 2014-09-24 10:58:15 -07:00
Ed Morley
6508c4365d Backed out changeset dcd7ac495365 (bug 1067888) for failures in browser_action_searchengine.js; CLOSED TREE 2014-09-24 16:09:01 +01:00
Alexandre Poirot
d1f9a4ff8c Bug 1067380 - Refactor webide to use app actor front. r=jryans 2014-09-24 08:21:00 -04:00
Alexandre Poirot
4a388cac4b Bug 1055666 - Remember last selected project in WebIDE. r=jryans 2014-09-24 05:31:00 -04:00
Neil Deakin
a2e7f62584 Bug 1006040, animate star panel when pressing escape, add argument to hidePopup to allow indication of whether the popup is being cancelled or not, r=neil 2014-09-24 12:15:49 -04:00
Matthias Versen
f3f873ed42 Bug 1070770 - Document profile option in commandline help. r=bsmedberg 2014-09-22 11:02:00 +02:00
Ryan VanderMeulen
b8084b8a51 Merge m-c to b2g-inbound. a=merge 2014-09-24 17:12:21 -04:00