Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-27 04:05:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
650,568 Commits 615 Branches 98 Tags 5.9 GiB
f551bbe0a8
Commit Graph

259 Commits

Author SHA1 Message Date
Marco Castelluccio
ff693ea459 Bug 1197461 - Implement Permissions.revoke. r=poiru,baku 2016-03-02 21:09:38 +00:00
J. Ryan Stinnett
2a55d065b7 Bug 1238160 - Rename OriginAttributes.mInBrowser and associated methods. r=bz,mayhemer 
This change renames OriginAttributes.mInBrowser to mInIsolatedMozBrowser and
nsIPrincipal::GetIsInBrowserElement to GetIsInIsolatedMozBrowserElement.  Other
methods that pass these values around also have name changes.

Tokens such as "inBrowser" have previously been serialized into cache keys, used
as DB column names, stored in app registries, etc.  No changes are made to any
serialization formats.  Only runtime method and variable names are updated.

No behavior changes are made in this patch, so some renamed methods may have
nonsensical implementations.  These are corrected in subsequent patches
focused on behavior.

MozReview-Commit-ID: 66HfMlsXFLs
 2016-03-02 10:35:56 -06:00
Sebastian Hengst
52418f89a7 Backed out 2 changesets (bug 1197461) for various test failures. r=backout on a CLOSED TREE 
Backed out changeset d776c61906c1 (bug 1197461)
Backed out changeset c046a81ab5a3 (bug 1197461)
 2016-02-15 19:38:11 +01:00
Marco Castelluccio
405b900180 Bug 1197461 - Tests for Permissions.revoke. r=poiru,baku 2016-02-09 17:46:36 +00:00
Marco Castelluccio
b9391900e0 Bug 1197461 - Implement Permissions.revoke. r=poiru,baku 2016-02-09 17:46:23 +00:00
Myk Melez
a6aff185d2 Bug 1238576 - disable mozApps API on desktop/Android; r=ehsan,ochameau,bz,mcmanus,jmaher,marco 2016-02-08 11:24:22 -08:00
Birunthan Mohanathas
bf5e6b94d0 Bug 1233702 - Remove dom.permissions.enabled pref. r=baku 2016-02-03 18:21:31 +02:00
John Shih
d212525a4c Bug 993311 - Convert Network Stats API to WebIDL. r=bzbarsky. 
--HG--
extra : rebase_source : c2523e634288c95213f44a789e6d46bfd40b8681
 2014-04-08 14:42:12 +08:00
Kyle Huey
91efc5a86c Bug 1241764: Replace nsPIDOMWindow with nsPIDOMWindowInner/Outer. r=mrbkap,smaug 2016-01-30 09:05:36 -08:00
Andrew McCreight
92df033f69 Bug 1239749 - Remove extra space from PermissionSettings.js debug message. r=gwagner 2016-01-14 10:02:00 -05:00
Birunthan Mohanathas
e84dd12876 Bug 1221104 - Throw NS_ERROR_NOT_IMPLEMENTED instead of NS_ERROR_UNEXPECTED for PushPermissionDescriptor.userVisible. r=baku 
This is merely for clarity. The spec does not require a TypeError to be thrown here.
 2015-12-18 15:02:50 +02:00
Birunthan Mohanathas
67d3279e83 Bug 1221104 - Revoke 'midi' permission queries with TypeError. r=baku 
According to the spec, we should reject unsupported permissions with a
TypeError. This removes the 'midi' entry entirely so that we get the expected
behaviour.
 2015-12-18 15:02:50 +02:00
Gregor Wagner
96837db759 Bug 1222478 - Enable more mulet tests. r=gerard-majax 2015-11-06 20:01:45 +01:00
Nathan Froyd
01583602a9 Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat 
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout.  The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.

CLOSED TREE makes big refactorings like this a piece of cake.

 # The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
    xargs perl -p -i -e '
 s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
 s/nsRefPtr ?</RefPtr</g;   # handle declarations and variables
'

 # Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h

 # Handle nsRefPtr.h itself, a couple places that define constructors
 # from nsRefPtr, and code generators specially.  We do this here, rather
 # than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
 # things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
     mfbt/nsRefPtr.h \
     xpcom/glue/nsCOMPtr.h \
     xpcom/base/OwningNonNull.h \
     ipc/ipdl/ipdl/lower.py \
     ipc/ipdl/ipdl/builtin.py \
     dom/bindings/Codegen.py \
     python/lldbutils/lldbutils/utils.py

 # In our indiscriminate substitution above, we renamed
 # nsRefPtrGetterAddRefs, the class behind getter_AddRefs.  Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
    xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'

if [ -d .git ]; then
    git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
    hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi

--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
 2015-10-18 01:24:48 -04:00
Stephanie Ouillon
ca377ad7db Bug 1201626 - Remove reference to kind attribute to calls to isExplicitInPermissionsTable(). r=fabrice 2015-10-12 14:20:00 +02:00
Carsten "Tomcat" Book
08997000eb Backed out 2 changesets (bug 1202902) to recking bug 1202902 to be able to reopen inbound on a CLOSED TREE 
Backed out changeset 647025383676 (bug 1202902)
Backed out changeset d70c7fe532c6 (bug 1202902)
 2015-10-07 14:03:21 +02:00
Carsten "Tomcat" Book
e7ef778c9d Backed out 1 changesets (bug 1202902) for causing merge conflicts to mozilla-central 
Backed out changeset cfc1820361f5 (bug 1202902)

--HG--
extra : rebase_source : 5d3db72337754bc7ab0ed0c30b2896100411ff92
 2015-10-07 12:13:45 +02:00
Shu-yu Guo
d06b6030f6 Bug 1202902 - Scripted fix the world. 2015-10-06 14:00:31 -07:00
Kit Cambridge
74ef03c1a6 Bug 1192458, Part 1 - Consolidate push and desktop notification permissions. r=nsm,wchen,MattN 
--HG--
extra : commitid : 1veevVaOOYv
 2015-10-05 16:39:34 -07:00
Stephanie Ouillon
5e14a3b3a8 Bug 1178533 - Add nsIInstallPackagedWebapp for registering permissions when navigating to signed packages r=bholley,fabrice,valentin 2015-08-26 13:12:13 +02:00
Carsten "Tomcat" Book
64c0a617b7 Backed out 1 changesets (bug 1178533) for xpcshell-1 test failures 
Backed out changeset b12584fad334 (bug 1178533)
 2015-09-24 08:41:04 +02:00
Stephanie Ouillon
478b31c634 Bug 1178533 - Add nsIInstallPackagedWebapp for registering permissions when navigating to signed packages. r=bholley, r=fabrice, r=valentin 2015-09-23 07:41:00 +02:00
Carsten "Tomcat" Book
58878018ac Backed out 1 changesets (bug 1178533) for s4 testfailures 
Backed out changeset 8bbdb80f67e0 (bug 1178533)

--HG--
extra : rebase_source : 040491f382ad7b03ba803686601f1272416ab47d
 2015-09-23 10:17:54 +02:00
Chris Peterson
71920a9550 Bug 1207030 - Enable -Wshadow flag in more directories that have no -Wshadow warnings. r=glandium 2015-09-22 21:39:03 -07:00
Stephanie Ouillon
ad9e2b8a95 Bug 1178533 - Add nsIInstallPackagedWebapp for registering permissions when navigating to signed packages. r=bholley, r=fabrice, r=valentin 2015-09-22 11:55:00 +02:00
Josh Matthews
6d8316690f Bug 885982 - Part 1: Convert TCPSocket to WebIDL and rewrite in C++. r=asuth,mayhemer,bz 2015-03-25 10:35:59 -04:00
Shu-yu Guo
64db2267cf Bug 1202902 - Mass replace toplevel 'let' with 'var' in preparation for global lexical scope. (rs=jorendorff) 2015-09-15 11:19:45 -07:00
Nicholas Nethercote
f44287005f Bug 1198334 (part 1) - Replace the opt-in FAIL_ON_WARNINGS with the opt-out ALLOW_COMPILER_WARNINGS. r=glandium. 
The patch removes 455 occurrences of FAIL_ON_WARNINGS from moz.build files, and
adds 78 instances of ALLOW_COMPILER_WARNINGS. About half of those 78 are in
code we control and which should be removable with a little effort.

--HG--
extra : rebase_source : 82e3387abfbd5f1471e953961d301d3d97ed2973
 2015-08-27 20:44:53 -07:00
Yoshi Huang
4347bb2318 Bug 1165272 - Part 1: remove getAppCodebasePrincipal. r=bholley 2015-08-17 17:03:19 +08:00
Bobby Holley
edfe287f26 Backed out 3 changesets (bug 1165272) for b2g sanity blocker. 2015-08-25 11:16:21 -07:00
Yoshi Huang
12efacfa8c Bug 1165272 - Part 1: Remove getAppCodebasePrincipal. r=bholley 2015-08-24 01:31:00 -04:00
Birunthan Mohanathas
bfc1b00a28 Bug 1105827 - Add test for invalid query. r=me 2015-08-21 19:53:29 -07:00
Birunthan Mohanathas
e53e26f42e Bug 1105827 - Part 11: Use nsRefPtr to store PermissionStatus. r=baku 2015-07-31 14:56:59 -07:00
Birunthan Mohanathas
e08489fa66 Bug 1105827 - Part 10: Fire change event for PermissionStatus objects. r=baku 2015-08-21 19:53:29 -07:00
Birunthan Mohanathas
4e546017c9 Bug 1105827 - Part 9: Add PermissionObserver to watch for perm-changed notifications. r=baku 2015-08-21 19:53:29 -07:00
Birunthan Mohanathas
9b37a607e3 Bug 1105827 - Part 8: Move permission checking into PermissionStatus. r=baku 2015-08-21 19:53:29 -07:00
Birunthan Mohanathas
1d9d861e76 Bug 1105827 - Part 7: Add helpers to convert between PermissionName and permission type. r=baku 2015-08-21 19:53:29 -07:00
Birunthan Mohanathas
b791230538 Bug 1105827 - Part 6: Add PermissionUtils.h for helper functions. r=baku 2015-08-21 19:53:29 -07:00
Birunthan Mohanathas
9067fe58d8 Backed out changeset 1e13c9c09273 (bug 1105827) 
CLOSED TREE
 2015-08-11 10:04:36 -07:00
Birunthan Mohanathas
e0592c3416 Backed out changeset 92d2843b5938 (bug 1105827) 2015-08-11 10:04:35 -07:00
Birunthan Mohanathas
02595ce842 Backed out changeset fc34b9b8e874 (bug 1105827) 2015-08-11 10:04:35 -07:00
Birunthan Mohanathas
8eab0f2e68 Backed out changeset 7ee1772ffc10 (bug 1105827) 2015-08-11 10:04:35 -07:00
Birunthan Mohanathas
af382947b1 Backed out changeset b78a97800675 (bug 1105827) 2015-08-11 10:04:35 -07:00
Birunthan Mohanathas
39a3ef841c Bug 1105827 - Part 10: Fire change event for PermissionStatus objects. r=baku 2015-07-31 15:57:02 -07:00
Birunthan Mohanathas
fd1e77d8fa Bug 1105827 - Part 9: Add PermissionObserver to watch for perm-changed notifications. r=baku 2015-07-31 15:53:46 -07:00
Birunthan Mohanathas
7b8a267e19 Bug 1105827 - Part 8: Move permission checking into PermissionStatus. r=baku 
This is in prepartion of a subsequent change where we will update the state
within PermissionStatus.
 2015-07-31 15:53:10 -07:00
Birunthan Mohanathas
d6ccefe440 Bug 1105827 - Part 7: Add helpers to convert between PermissionName and permission type. r=baku 2015-07-31 15:49:59 -07:00
Birunthan Mohanathas
a1f31ea066 Bug 1105827 - Part 6: Add PermissionUtils.h for helper functions. r=baku 2015-07-31 15:49:55 -07:00
Birunthan Mohanathas
dada7df20d Bug 1105827 - Part 5: Add test for Permissions.query. r=baku 2015-07-28 06:33:46 -07:00
Birunthan Mohanathas
1b06c90f49 Bug 1105827 - Part 3: Implement Permissions.query. r=baku 2015-07-28 06:33:46 -07:00
Birunthan Mohanathas
9f7a600881 Bug 1105827 - Part 2: Add stub Permissions implementation. r=baku 2015-07-28 06:33:46 -07:00
Birunthan Mohanathas
35a22756c6 Bug 1105827 - Part 1: Add stub PermissionStatus implementation. r=baku 2015-07-28 06:33:46 -07:00
Neil Deakin
af1ece91c4 Bug 1153248, re-enable a bunch of tests that now work with e10s, r=billm 2015-04-16 15:38:12 -04:00
Hsin-Yi Tsai
8193feee0c Bug 1121850 - Add [AvailableIn=CertifiedApps] and [CheckPermissions=cellbroadcast] to Cellbroadcast interfaces. r=smaug 2015-01-29 15:49:40 +08:00
Hsin-Yi Tsai
99c0b7e0f8 Bug 1121853 - Add [AvailableIn=CertifiedApps] and [CheckPermissions=voicemail] to Voicemail interfaces. r=smaug 2015-01-29 15:32:33 +08:00
Hsin-Yi Tsai
369f515538 Bug 1116670 - Add [AvailableIn=CertifiedApps] and [CheckPermissions=sms] to MozMobileMessageManager.webidl. r=smaug 2015-01-05 18:34:31 +08:00
Markus Nilsson
dfb7fb4437 Bug 1084505 - Fix explicit permission lookup for trusted hosted apps r=fabrice 2015-01-31 11:10:50 -08:00
Jan Varga
f514a5ed5b Bug 1123637 - Remove all code relevant to quota prompts; r=bent,ehsan 2015-01-22 09:40:42 +01:00
Phil Ringnalda
53a5e2bb9c Back out 3 changesets (bug 885982, bug 1118063) for b2g mochitest-6 bustage 
CLOSED TREE

Backed out changeset 865e7bc208df (bug 885982)
Backed out changeset 9ede577f5ada (bug 885982)
Backed out changeset 6ccc86f7429e (bug 1118063)

--HG--
rename : dom/network/interfaces/nsITCPServerSocketInternal.idl => dom/network/interfaces/nsIDOMTCPServerSocket.idl
 2015-01-17 13:26:10 -08:00
Josh Matthews
2e2e3a6cef Bug 885982 - Convert MozTCPSocket to WebIDL. r=baku 2013-06-24 16:50:00 -04:00
Shih-Chiang Chien
fbddc387d5 Bug 1080474 - Part 2 - expose device information via PresentationDeviceInfoManager API. r=khuey r=fabrice. 2014-11-14 13:55:24 -08:00
Jan Varga
3528192339 Bug 1083927 - IndexedDB: Subdomain Quota Management; r=bent,ehsan 
--HG--
rename : dom/indexedDB/test/unit/bug1056939.zip => dom/indexedDB/test/unit/bug1056939_profile.zip
 2014-11-28 09:44:12 +01:00
Ryan VanderMeulen
5cb04cdd21 Bug 1093079 - Disable test_bluetooth.html for frequent timeouts resulting from being moved from the beginning of one chunk to the end of another. 
--HG--
extra : rebase_source : e14bfbcac8522233c51b9f3cd55f367e5d968c0b
 2014-11-03 17:09:16 -05:00
Fredrik Lanker
5c16974f01 Bug 1091601 - Settings closes down when changing permissions for THA applications r=fabrice 
Application kind is used in isExplicitInPermissionsTable for checking
the permissions in the permission table. When calling the function from
PermissionSettings, the app kind wasn't passed so the permission check
failed. This lead to Settings closing down when trying to change the
permissions in "App permissions", due to the assert in receiveMessage
(dom/permission/PermissionSettings.jsm).

---
 dom/permission/PermissionSettings.jsm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
 2014-10-30 15:02:51 -07:00
Andrew Halberstadt
d292ee73f1 Bug 1066735 - Remove root b2g and android specific xpcshell manifests, r=chmanchester 2014-10-07 18:18:28 -04:00
Bobby Holley
9f6dfee5c1 Bug 1065185 - Fix permissions tests. r=bz 2014-10-03 10:05:49 +02:00
Kyle Machulis
5738eae835 Bug 846200 - Update mochitests to use new settings-api permissions; r=bent 
--HG--
extra : rebase_source : edf9accf26a49a541c2f87847c2fe89c42a20fd6
 2014-08-27 21:01:29 -07:00
Sam Penrose
24dab05837 Bug 1058319 - Add a geolocation-noprompt permission part 2: tests r=fabrice 2014-08-28 15:21:16 -07:00
Ryan VanderMeulen
a408d636f2 Backed out 11 changesets (bug 1059079, bug 1015518, bug 900551, bug 846200) for Gaia UI test failures on a CLOSED TREE. 
Backed out changeset d85b4e48b3b4 (bug 1015518)
Backed out changeset 663b73ba69ec (bug 1015518)
Backed out changeset 5cf1cb5fa022 (bug 900551)
Backed out changeset b953dd5bfdaa (bug 900551)
Backed out changeset a2b6d7c84100 (bug 900551)
Backed out changeset ceb79fe83d15 (bug 900551)
Backed out changeset f6acf344fbf0 (bug 900551)
Backed out changeset fa269ea53937 (bug 846200)
Backed out changeset b89c84a850f9 (bug 846200)
Backed out changeset b7a7dfbe4e3f (bug 846200)
Backed out changeset c6f54d821c11 (bug 1059079)
 2014-08-28 12:49:49 -04:00
Kyle Machulis
4c6ba3bb66 Bug 846200 - Update mochitests to use new settings-api permissions; r=bent 2014-08-27 21:01:29 -07:00
Shih-Chiang Chien
364544d0c0 Bug 745283 - Part 2: Add udp-socket permission. r=sicking, r=baku 2014-05-28 13:56:23 +08:00
Fabrice Desré
eabd72e065 Bug 899322 - Convert the mozApps API to use webidl r=marco,bholley 2014-08-19 09:30:54 -07:00
Reuben Morais
62da4d3530 Bug 1009645 - Remove FeatureDetectible, add things with CheckPermissions or AvailableIn to the feature list instead. r=smaug 2014-07-24 16:57:02 -03:00
Ms2ger
d8c0b17d7d Bug 1043963 - Collapse test-only moz.build files under dom/ into ancestor moz.build files; r=ted 
There is very little benefit to having another layer of moz.build files, and
removing them will speed up the build a minimal amount. It also paves the way
for removing TEST_DIRS, which could simplify the build system somewhat.
 2014-07-26 08:17:24 +02:00
Alexandre Poirot
7ea4dd517f Bug 1027242 - Blacklist mulet's failing tests + expose 'mulet' to ini files; fix previous bustage on a CLOSED TREE, r=ahal 2014-07-02 15:40:56 -07:00
Fabrice Desré
81b398a87e Bug 1024513 - JavaScript Error: "NS_ERROR_XPC_JAVASCRIPT_ERROR_WITH_DETAILS: [JavaScript Error: "targetElement is null" r=smaug 
* * *
Bug 1024513 - followup to get ASAN builds r=me
 2014-07-07 21:45:23 -07:00
Ed Morley
8ee300da67 Backed out changeset a2f2a28e0856 (bug 1024513) for build failures 2014-07-08 16:03:04 +01:00
Fabrice Desré
ea0b9577b3 Bug 1024513 - JavaScript Error: "NS_ERROR_XPC_JAVASCRIPT_ERROR_WITH_DETAILS: [JavaScript Error: "targetElement is null" r=smaug 2014-07-07 21:45:23 -07:00
Fabrice Desré
5bed77b60d backout a6ae40c60e77 for build failures 2014-07-07 22:21:51 -07:00
Fabrice Desré
4b31a8b821 Bug 1024513 - JavaScript Error: "NS_ERROR_XPC_JAVASCRIPT_ERROR_WITH_DETAILS: [JavaScript Error: "targetElement is null" r=smaug 2014-07-07 21:45:23 -07:00
Yuan Xulei
9c58a25bae Bug 1027127 - Remove setTimeout to avoid intermittent test failure. r=dchan 2014-07-03 14:07:06 +08:00
David Chan
aa323b03a4 Bug 1025994 - Rewrite webapps-manage test. r=baku 2014-06-26 15:00:52 -07:00
Vicamo Yang
abc8270f73 Bug 958782 - 3/3: fix test cases. r=gene,khuey 2014-06-25 11:57:19 +08:00
Sean Lin
4dd7733b2e Bug 901114 - Convert Alarm API to WebIDL. r=nsm, sr=jst 2014-06-13 14:19:11 +08:00
Reuben Morais
6b28e6ff71 Bug 952486 - Use CheckPermissions instead of Func for several interfaces. r=bz 2014-05-25 15:31:11 -03:00
Fabrice Desré
2deb233e1d Bug 952486 - backout for breaking all device and emulator builds (keeping dom reviewer to land the backout...) r=bz 2014-05-26 12:11:52 -07:00
Reuben Morais
df3026450e Bug 952486 - Use CheckPermissions instead of Func for several interfaces. r=bz 2014-05-25 15:31:11 -03:00
Nathan Froyd
5340877d74 Bug 1003312 - make PermissionSettings.js{,m} use Services.jsm more; r=fabrice 2014-04-29 13:27:51 -04:00
Yuan Xulei
1e81d62a84 Bug 934367 - Implement createFile for Directory. r=dhylands 2014-03-05 16:40:48 +08:00
Yuan Xulei
9982695b17 Bug 986992 - Remove navigator.mozKeyboard. r=fabrice 2014-04-09 20:03:00 +02:00
Dimi Lee
f22f8639ec Bug 886110 - Relanding Convert WifiManager to WebIDL on a CLOSED TREE. r=bz 
--HG--
extra : amend_source : 97458b301b31ad64fa230cac53d0230ca6e02e4d
 2014-04-10 11:34:29 +08:00
Carsten "Tomcat" Book
6e98909e99 Backed out changeset ce623d85f0c4 (bug 886110) for hoping this resolve the m7 b2g-ics permanent failure on a CLOSED TREE 2014-04-14 12:24:21 +02:00
Dimi Lee
23741a3a55 Bug 886110 - Convert WifiManager to WebIDL; r=bz 2014-04-10 11:34:29 +08:00
Ehsan Akhgari
fccd52de29 Bug 985796 - Port the permission settings API to WebIDL; r=bzbarsky 2014-03-22 09:58:24 -04:00
Ryan VanderMeulen
e23e8b1d8f Backed out changeset 463fa756b43b (bug 886110) for causing various regressions. 2014-03-21 14:44:05 -04:00
Dimi Lee
991a66bbd8 Bug 886110 - Convert WifiManager to WebIDL. r=mrbkap 2014-03-19 14:04:58 +08:00
Bill McCloskey
fd05f3eb04 Bug 982828 - [e10s] Disable mochitest-plain tests that don't pass in e10s (r=ted) 2014-03-13 21:38:19 -07:00
Wes Kocher
3b83e5bb22 Backed out changeset 88425ad0f06a (bug 982828) for introducing various mochitest-5 failures on a CLOSED TREE 
* * *
Backed out changeset 94f9ebdc6662 (bug 982828)
 2014-03-13 19:41:21 -07:00
Bill McCloskey
e784b5aef6 Bug 982828 - [e10s] Disable mochitest-plain tests that don't pass in e10s (r=ted) 2014-03-13 15:41:41 -07:00
Bill McCloskey
006786a6b4 Backed out changeset d6261f65070a 2014-03-13 15:52:27 -07:00