Commit Graph

1752 Commits

Author SHA1 Message Date
Bill McCloskey
61c692b5b4 Bug 974007 - Change OMTC behavior when browser.tabs.remote is set (r=mattwoodrow,felipe) 2014-02-20 17:26:41 -08:00
Ehsan Akhgari
f594359272 Bug 975740 - Port WIN32_EXE_LDFLAGS to moz.build; r=mshal 2014-02-24 08:30:25 -05:00
Ehsan Akhgari
f830a45d96 Bug 975733 - Move some LDFLAGS for building executables on Windows to moz.build; r=mshal 2014-02-26 21:38:29 -05:00
Honza Bambas
ef07fabca9 Bug 975829 - End the first HTTP cache v2 trial on Nigtly, r=jduell DONTBUILD 2014-02-25 02:30:55 +01:00
Ryan VanderMeulen
77e1eb4e84 Merge m-c to inbound. 2014-02-18 15:25:07 -05:00
Honza Bambas
91218ee3b4 Bug 967693 - Temporarily turn on HTTP cache v2 on for Desktop Firefox Nightly users, r=jduell+ehsan 2014-02-18 19:06:06 +01:00
Dão Gottwald
3984f3139b Bug 973189 - Get rid of the browser.ctrlTab.recentlyUsedLimit pref. r=ttaubert
--HG--
extra : rebase_source : 353e5533fa5c88624a0c3e94170c131485841609
2014-02-18 14:44:31 +01:00
Tim Taubert
0f98e74c72 Bug 967197 - "Create Account" and "Sign In" links in Sync preferences should go to separate pages r=markh 2014-02-18 12:05:13 +01:00
Masatoshi Kimura
dfb3f0e76b Bug 969918 - Use decltype to declare pointers for dynamic-loaded functions. r=jimm sr=roc 2014-02-18 07:32:52 +09:00
Phil Ringnalda
c422c4939c Merge f-t to m-c 2014-02-15 10:10:31 -08:00
ffxbld
3b86d18d0f No bug, Automated blocklist update from host bld-linux64-spot-065 - a=blocklist-update 2014-02-15 03:17:42 -08:00
Ryan VanderMeulen
8c3fa1055e Backed out changeset c4aba8973e0f (bug 966692) for mochitest-bc failures. 2014-02-13 16:21:02 -05:00
Rob Campbell
6dbb08dd03 Bug 966692 - Reduce the default set of warnings we display in console. r=msucan 2014-02-12 09:03:00 -05:00
Jared Wein
19ada84adb Bug 971626 - [Australis] Restore Defaults should collapse Title Bar. r=Gijs 2014-02-14 13:51:33 -05:00
Ryan VanderMeulen
b00bcceebe Merge m-c to inbound. 2014-02-11 14:58:40 -05:00
Victor Porof
0460cf4ed2 Bug 969448 - Netmonitor selected filter reset to "All" upon every new page request, r=rcampbell 2014-02-11 09:25:21 -05:00
Bill McCloskey
ad8c727e10 Bug 960783 - Support "new out-of-process window" menu item in nightly (r=felipe,bsmedberg,trevor,ted) 2014-02-11 09:01:08 -08:00
Ehsan Akhgari
b870bb3fe9 Bug 969757 - Remove the dead code in our tree which pretends to support OS/2; r=roc,mcmanus,gps,jorendorf,bsmedberg sr=bsmedberg 2014-02-10 17:57:01 -05:00
Mike Perry
4f72039672 Bug 967970 - Disable 'Saved Application State' in MacOS via plist property. r=smichaud 2014-02-10 15:26:18 -06:00
Ryan VanderMeulen
7c4efd7351 Merge m-c to inbound. 2014-02-10 15:43:52 -05:00
Ryan VanderMeulen
afbec0e4a9 Merge inbound to m-c. 2014-02-10 15:42:58 -05:00
Ehsan Akhgari
fb23854e8f Bug 968642 - Port RCFILE and RESFILE to moz.build; r=gps 2014-02-10 09:03:53 -05:00
Ehsan Akhgari
5a96208edf Bug 968631 - Port some LOCAL_INCLUDES variables to moz.build; r=mshal 2014-02-10 13:41:02 -05:00
Brian Grinstead
90eea8a6de Bug 966308 - DevTools Themes - Make dark theme the default;r=robcee 2014-02-10 09:33:47 -06:00
ffxbld
5fac89ec52 No bug, Automated blocklist update from host bld-linux64-ec2-354 - a=blocklist-update 2014-02-08 03:13:57 -08:00
Marco Bonardo
efc6b43f8d Bug 824433 - Bookmarks backup takes a long time to write out on shutdown. r=mano 2014-02-04 14:43:20 +01:00
Carsten "Tomcat" Book
87668576b7 merge fx-team to mozilla-central 2014-02-07 09:52:32 +01:00
Emanuel Hoogeveen
d786f24933 Bug 943339 - Part 1: Only store a subset of session history entries to file. r=Yoric 2014-02-06 20:15:59 -05:00
Jim Mathies
96eeaae8c7 Bug 968774 - Don't set XUL_APP_FILE on metrofx startup. r=mbrubeck 2014-02-06 17:41:13 -06:00
Patrick Brosset
4b885fdd46 Bug 932896 - Retrieves image data from server for image tooltips and makes tooltip size a pref, r=jwalker,ttaubert 2014-02-05 11:53:46 +01:00
Carsten "Tomcat" Book
89b91b0de3 Backed out changeset 18d70a3136f5 (bug 932896) for mochitest-other bustage on a CLOSED TREE 2014-02-05 11:36:02 +01:00
Paul Rouget
b61d77d686 Bug 932896 - Retrieves image data from server for image tooltips and makes tooltip size a pref, r=jwalker,ttaubert 2014-02-05 10:02:52 +01:00
Ryan VanderMeulen
5dac4f304b Merge m-c to fx-team. 2014-02-01 17:23:29 -05:00
ffxbld
2a7ad48009 No bug, Automated blocklist update from host bld-linux64-ec2-461 - a=blocklist-update 2014-02-01 03:13:43 -08:00
Mark Hammond
bf712b98a7 Bug 966520 - have sync prefs pane open the new "force sign in" page. r=gavin 2014-01-31 17:27:59 -08:00
Victor Porof
e9ae497850 Bug 946601 - Add performance statistics/piecharts in the Network Monitor, r=rcampbell 2014-02-01 08:37:53 +02:00
Panos Astithas
1e08ba7e01 Disable auto-pretty-print by default until we fix the heuristics (bug 962857). r=robcee 2014-01-31 18:30:27 +02:00
Dagger
c2cc245722 Bug 963937 - Add a pref to disable automatic bracket closing in source editor. r=anton 2014-01-30 20:21:00 -08:00
Blair McBride
d4b80e5137 Bug 956990 - Temporarily make extensions.checkCompatibility=false not work for Australis-incompatible themes. r=Mossop 2014-01-31 01:00:47 +13:00
Girish Sharma
8bc1f3a4e7 Bug 717369 - Autocomplete CSS properties and values in the Style Editor - Part 1 - No tests, r=anton, msucan, dcamp, robcee, harth 2014-01-28 20:38:41 +05:30
ffxbld
b36e4a3d5b No bug, Automated blocklist update from host bld-linux64-ec2-341 - a=blocklist-update 2014-01-25 03:17:21 -08:00
Tim Taubert
10b047742e Bug 960903 - Broadcast session history data r=yoric 2014-01-20 17:37:41 +01:00
Mark Hammond
ff5208507e Bug 960332 - update Fxa URLs to production server. r=ckarlof. 2014-01-25 00:33:39 +11:00
Mark Hammond
c8e9be53bc Bug 963314 - Add pref for Fxa 'settings' URL. r=ttaubert 2014-01-25 00:33:39 +11:00
Phil Ringnalda
19487a104f Back out 285204b60e94 and f401b820cd6a (bug 967693) to turn HTTP cache v2 off to investigate the effect on the influx of failed tests
CLOSED TREE
2014-02-05 22:58:37 -08:00
Honza Bambas
cdac679592 Bug 967693 - Temporarily turn on HTTP cache v2, alternative pref to not lose early adopters, r=jduell 2014-02-05 23:36:56 +01:00
Ryan VanderMeulen
5150c7bb77 Merge m-c to inbound on a CLOSED TREE. 2014-02-05 15:54:37 -05:00
Honza Bambas
00d931d5da Bug 967693 - Temporarily turn on HTTP cache v2 on Desktop Firefox Nightly, r=jduell 2014-01-09 00:27:29 +01:00
Tim Taubert
7c1a224b2f Bug 957421 - Keep FxA pref names consistent r=markh,rnewman,nalexander 2014-01-21 14:13:45 +01:00
Robert Strong
549d097e8b Bug 925747 - patch file extraction cleanup. r=bbondy 2014-01-22 17:16:39 -08:00
ffxbld
de1cd37c67 No bug, Automated blocklist update from host bld-linux64-ec2-474 - a=blocklist-update 2014-01-18 03:16:28 -08:00
Tim Taubert
8fafa9176a Bug 952092 - Get rid of post data in SessionStore r=smacleod
From 243232f7d2522e82622c031923271ed76ffdc42a Mon Sep 17 00:00:00 2001
2014-01-14 18:21:48 +01:00
Ryan VanderMeulen
b05202b7e2 Merge inbound to m-c. 2014-01-16 15:06:12 -05:00
Anton Kovalyov
d9b64b76ed Bug 734439 - Add code folding support to the source editor. r=msucan r=benvie 2014-01-15 16:23:32 -08:00
Anton Kovalyov
57570f0640 Bug 941725 - Add emacs and vim key bindings to source editor. r=harth r=benvie r=msucan 2014-01-15 12:04:19 -08:00
Ed Morley
746b0390b4 Merge latest green fx-team changeset and mozilla-central 2014-01-15 16:14:41 +00:00
Chris Karlof
3849442104 Bug 959859: Update remote Firefox Accounts content URL to use new deployment. r=markh 2014-01-15 09:53:41 +01:00
Ben DeCoste
2dae43534f Bug 910183 - Highlight trailing space in the editor. r=msucan 2014-01-14 14:12:39 -08:00
Gian-Carlo Pascutto
24ad1b7f19 Bug 783047 - Update SafeBrowsing URLs to use HTTPS. r=mmc,dcamp sr=gavin 2014-01-16 09:27:59 +01:00
ffxbld
cc098edc2e No bug, Automated blocklist update from host bld-linux64-ix-031 - a=blocklist-update 2014-01-11 03:16:14 -08:00
Monica Chew
b85fdf7bc2 Bug 957704: Switch from apikey to key for browser.safebrowsing.updateURL (r=gcp,dougt) 2014-01-09 10:20:59 -08:00
Hubert B Manilla
98892aa0be Bug 913665 - Detect minified files and pretty print them by default; r=fitzgen 2013-12-24 15:32:55 +01:00
ffxbld
89b7e612d8 No bug, Automated blocklist update from host bld-linux64-ix-037 - a=blocklist-update 2013-12-21 03:14:46 -08:00
Tim Taubert
4be4a6b411 merge m-c to elm 2013-12-19 15:52:32 +01:00
Nick Fitzgerald
00a923905f Bug 929349 - Integrate a tracing debugger into our existing debugger; r=vporof,past 2013-12-18 14:17:27 -08:00
Brian Warner
84b3f1b25e Bug 949699 - switch fxa jelly to "moar_native". 2013-12-17 15:45:03 +11:00
Nick Alexander
3bf2796013 Merge m-c to elm 2013-12-16 09:13:10 -08:00
ffxbld
9f2bdf5624 No bug, Automated blocklist update from host bld-centos6-hp-016 - a=blocklist-update 2013-12-14 03:11:25 -08:00
Nick Alexander
4eb068477b Merge m-c to elm 2013-12-11 14:08:02 -08:00
Nick Alexander
17885804f2 Merge m-c to elm 2013-12-11 10:25:40 -08:00
Heather Arthur
1ef2e1c103 Bug 926014 - Support CSS source maps; r=dcamp
--HG--
rename : browser/devtools/styleeditor/StyleEditorPanel.jsm => browser/devtools/styleeditor/styleeditor-panel.js
2013-12-06 23:52:32 -08:00
Carsten "Tomcat" Book
5484d45941 merge fx-team to mozilla-central 2013-12-07 12:47:39 +01:00
ffxbld
fb5abde820 No bug, Automated blocklist update from host bld-linux64-ec2-143 - a=blocklist-update 2013-12-07 03:21:51 -08:00
Carsten "Tomcat" Book
6cbfff1e23 Backed out changeset 8deb6f225d0a (bug 926014) XPC Shell failures and other failures
--HG--
rename : browser/devtools/styleeditor/styleeditor-panel.js => browser/devtools/styleeditor/StyleEditorPanel.jsm
2013-12-07 09:50:02 +01:00
Heather Arthur
f025be6927 Bug 926014 - Support CSS source maps; r=dcamp
--HG--
rename : browser/devtools/styleeditor/StyleEditorPanel.jsm => browser/devtools/styleeditor/styleeditor-panel.js
2013-12-06 23:52:32 -08:00
Brian Grinstead
2c3d0eab59 Bug 938616 - webconsole UI updates while in split mode with other panels;r=msucan 2013-12-06 09:46:51 -06:00
David Major
aa837e64ac Bug 939043 - Downgrade the user32 assertion to a warning message. r=bsmedberg 2013-12-06 10:21:16 -05:00
Stephen Pohl
a481a4c486 Backout 2ea21428f70c (bug 860493) while working on overall performance and bugs for swipe animations. r=me 2013-12-06 09:41:09 -05:00
J. Ryan Stinnett
01d7ec0423 Bug 925921 - Enable Manifest Editor by default. r=paul 2013-12-04 13:29:47 -06:00
Nick Alexander
93e112c0d8 Merge m-c to elm 2013-11-18 08:22:59 -08:00
Gijs Kruitbosch
1e3930ad3d Merge m-c to ux 2013-11-17 23:37:53 +01:00
philringnalda@gmail.com
61aa1858ba No bug, Automated blocklist update from host slice - a=blocklist-update 2013-11-17 10:51:07 -08:00
Florian Quèze
86092d2582 Bug 930641 - Remove the social.allowMultipleWorkers preference, r=mixedpuppy. 2013-12-18 16:50:05 +01:00
Gijs Kruitbosch
4f5a01fecc Merge mozilla-central and ux 2013-11-15 18:32:01 +01:00
Nick Alexander
c4c4054b38 Merge m-c to elm 2013-11-14 22:41:14 -08:00
Nick Alexander
954a0cd13b Merge b-i to elm
--HG--
rename : b2g/chrome/content/forms.js => dom/inputmethod/forms.js
2013-11-13 15:16:51 -08:00
Nick Alexander
4bf3628f8f Merge m-c to elm 2013-11-13 13:43:32 -08:00
Gijs Kruitbosch
35947d2cb9 Merge mozilla-central and ux 2013-11-13 00:28:03 +01:00
Ryan VanderMeulen
bbb92b7cee Merge m-c to fx-team on a CLOSED TREE. 2013-11-12 15:37:07 -05:00
Paul Rouget
30ac55dbf8 Bug 912891 - [app manager] Open the toolbox in the app manager. r=ochameau 2013-11-15 21:47:00 -05:00
Ed Morley
c3bf3239c0 Merge mozilla-central and fx-team 2013-11-12 15:12:05 +00:00
Oprea Andrei
55c481da05 Bug 722267 - Option to enable/disable timestamps for messages in the console; r=msucan 2013-11-11 19:00:07 +02:00
ffxbld
60d8debe0f No bug, Automated blocklist update from host bld-linux64-ec2-013 - a=blocklist-update 2013-11-09 03:15:09 -08:00
Carsten "Tomcat" Book
c40b2ecd96 merge fx-team to mozilla-central 2013-12-03 10:39:56 +01:00
Zachary Carter
6598d03bb0 Bug 935232 - Implement a client for the Firefox Accounts auth server. r=markh 2013-12-02 13:56:24 -08:00
Mike Hommey
bf60896454 Bug 943728 - Replace double quotes with single quotes in Makefiles (or remove them when it makes sense). r=mshal 2013-12-03 06:34:21 +09:00
ffxbld
3315278431 No bug, Automated blocklist update from host bld-centos6-hp-008 - a=blocklist-update 2013-11-30 03:11:29 -08: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
Nick Alexander
ced852a484 Merge m-c to elm 2013-11-04 21:25:12 -08:00
Wes Kocher
e6aeda0671 Merge inbound to m-c 2013-11-04 21:09:17 -08:00
Stephen Pohl
d54b503b6d Bug 860493 - Enable history swipe animations by default on nightly and aurora (implemented in bug 678392). r=smichaud 2013-11-04 13:26:41 -05:00
Ryan VanderMeulen
dc98bd3508 Backed out changesets f488602d26c9 and 09725c69fd76 (bug 860493) for OSX bustage.
CLOSED TREE
2013-11-04 12:55:56 -05:00
Stephen Pohl
81651a44ae Bug 860493 - Enable history swipe animations by default on nightly and aurora (implemented in bug 678392). r=smichaud 2013-11-04 12:10:10 -05:00
Ryan VanderMeulen
05d9f55e59 Backed out changesets cf64922197ca, 3ae60bdf3fef, and 68960c6bdce3 (bug 906839) for ASAN mochitest-bc perma-orange. 2013-11-04 15:54:55 -05:00
Nick Alexander
b2ece0addd Merge m-c to elm 2013-10-29 13:13:49 -07:00
Gijs Kruitbosch
c267cbe07d Merge mozilla-central and ux 2013-11-12 17:30:17 +01:00
Gijs Kruitbosch
16224718cf Merge mozilla-central and ux 2013-11-12 09:27:50 +01:00
Gijs Kruitbosch
081b5f4b6b Merge mozilla-central and ux 2013-11-11 09:29:29 +01:00
Matthew Noorenberghe
c32c2b79c8 Merge mozilla-central to UX 2013-11-09 17:46:29 -08:00
Jared Wein
012d1115e2 Automated merge with https://hg.mozilla.org/mozilla-central 2013-11-08 13:22:23 -05:00
Gijs Kruitbosch
af554675e2 Merge mozilla-central and ux 2013-11-07 19:21:54 +00:00
Mike Hommey
ebd64d4dbd Bug 934070 - Stop copying dist/bin under dist/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS in */app/Makefile.in. r=ted
Consequently, revert changeset 92bea49b46b4 (bug 914560).
2013-11-07 10:38:13 +09:00
Mike Hommey
d2778baa7e Bug 862770 - Fix --disable-compile-environment a little. r=gps
--HG--
rename : config/makefiles/target_libs.mk => config/makefiles/target_binaries.mk
rename : js/src/config/makefiles/target_libs.mk => js/src/config/makefiles/target_binaries.mk
2013-11-07 10:37:45 +09:00
Gijs Kruitbosch
37ba637e69 Merge m-c to ux 2013-11-06 14:36:26 +01:00
Carsten "Tomcat" Book
5abe12cadb merge fx-team to mozilla-central 2013-11-06 13:09:28 +01:00
Gijs Kruitbosch
c38e551bb3 Merge mozilla-central and ux 2013-11-06 09:01:08 +01:00
Mike Hommey
5bc79f4c3d Bug 934905 - Remove browser/app/profile/extensions/Makefile.in after bug 867445. r=mshal 2013-11-06 14:25:14 +09:00
Ryan VanderMeulen
8065e2373d Merge inbound to m-c. 2013-11-05 15:28:52 -05:00
Matthew Noorenberghe
e8d8f80693 Merge mozilla-central to UX 2013-11-05 01:04:20 -08:00
Gijs Kruitbosch
2312eb362b Merge mozilla-central and ux 2013-11-02 11:33:53 +01:00
ffxbld
2cfe0f79da No bug, Automated blocklist update from host bld-linux64-ec2-178 - a=blocklist-update 2013-11-02 03:16:39 -07:00
Shane Caraveo
3ae066f41c Bug 906839 - enable by default social.allowMultipleWorkers - update tests to work pref'd on and fix a missing update to the worker state, r=markh. 2013-10-31 10:59:35 +11:00
Seth Fowler
90d83b3d32 Backout of bug 934070 for breaking debugging on OS X 2013-11-07 18:42:22 -08:00
Nick Alexander
abaf8ce510 Merge m-c to elm 2013-10-26 17:23:11 -07:00
ffxbld
0270881b81 No bug, Automated blocklist update from host bld-linux64-ec2-093 - a=blocklist-update 2013-10-26 03:14:34 -07:00
Ed Morley
d160d00dbe Merge mozilla-central and fx-team 2013-10-25 12:19:55 +01:00
Carsten "Tomcat" Book
f19f416288 Merge Fx-Team to Mozilla-Central 2013-10-25 11:21:15 +02:00
Stephen Pohl
e3a9eca39f Bug 930768: Backout 6155ea7e8dea for causing pages to refresh (instead of using bfcache) when swiping back and forth on OSX. r=smichaud 2013-10-24 21:57:54 -04:00
Mike Hommey
1d566f7586 Bug 929905 - Consolidate sources in moz.build. r=gps 2013-10-25 08:23:05 +09:00
Monica Chew
14a07a2065 Bug 887044: Remove CsdTesting/Mozilla from User-Agent, set safebrowsing URLs to use the GOOGLE_API_KEY (r=dougt) 2013-11-01 15:43:28 -07:00
Nick Alexander
e4a9d8d0e4 Merge m-c to elm 2013-10-24 09:35:02 -07:00
Monica Chew
7c72bdd32b Bug 895476: Enable updating local lists for application reputation (r=gcp) 2013-10-31 14:15:14 -07:00
Paul Rouget
f2fbd2c126 Bug 912891 - [app manager] Open the toolbox in the app manager. r=ochameau 2013-11-07 09:14:22 -05:00
Ryan VanderMeulen
a721e543d2 Backed out changesets e41b160a4ada and 90624f34525a (bug 912891) on the suspicion of turning bug 934852 into a perma-fail on WinXP debug. 2013-11-07 14:08:14 -05:00
Carsten "Tomcat" Book
7a60858f4d merge mozilla-central to fx-team 2013-11-07 16:04:23 +01:00
Paul Rouget
da984a4792 Bug 912891 - [app manager] Open the toolbox in the app manager. r=ochameau 2013-11-07 09:14:22 -05:00
Paolo Amadini
30c71292f2 Bug 928349 - Add a build-time setting to use only the JavaScript API for downloads, and enable it in Firefox for Desktop. r=enn 2013-10-23 21:46:47 +02:00
Benjamin Smedberg
6d4198e5fd Bug 941137 - Alter plugin defaults on the beta/release channel so that Java is still click-to-activate by default, but other plugins are not for the next few releases while we articulate a potential whitelist/transition strategy, r=gfritzsche 2013-11-20 15:33:05 -05:00
Anton Kovalyov
e26d1575d0 Bug 929766 - Remove Orion from the SourceEditor component. r=msucan 2013-11-19 15:53:13 -08:00
Nick Alexander
e4013cce32 Merge m-c to elm 2013-10-23 09:00:38 -07:00
Victor Porof
39ed225e41 Bug 910955 - Implement a live WebGL shader editor, r=dcamp 2013-10-25 10:18:41 +03:00
Ed Morley
2ef751e1f6 Backed out changeset cfd30965638a (bug 906839) 2013-10-24 18:50:31 +01:00
Shane Caraveo
ddef2f007b Bug 906839 - enable by default social.allowMultipleWorkers - flip the pref, r=markh. 2013-10-24 15:53:37 +02:00
Nick Alexander
9647199b35 Merge m-c to elm 2013-10-22 09:19:06 -07:00
Rob Campbell
2298755141 Bug 909756 - Turn off CSS warnings by default in Web Console. r=msucan 2013-10-22 03:25:54 +02:00
Nick Alexander
1870fe9166 Merge m-c to elm 2013-10-21 09:19:47 -07:00
Benjamin Smedberg
1b8c0cf234 Fixup for bug 927174 - use the preexisting app.support.baseURL pref instead of a custom one
--HG--
extra : rebase_source : 90f2f8dc85b9198bca608b46bee037d93a118543
2013-10-21 10:33:49 -04:00
Yury Delendik
2fd5d5a66a Bug 926988 - Keep Shumway in nightly only 2013-10-21 20:39:43 -05:00