Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-29 21:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
417,599 Commits 615 Branches 98 Tags 6 GiB
7240423cf8
Commit Graph

231 Commits

Author SHA1 Message Date
Mike Hommey
470d65a751 Backout changeset 96baea8ac9ab and 85fb6b5bc62a (part of resp. bug 922912 and bug 609976) because it appears it has not been necessary for a while 2014-10-18 16:16:17 +09:00
Mike Hommey
2c68e442bb Bug 922912 - Update removed-files.in to account for the removal of gkmedias.dll. r=mshal 2014-10-18 09:29:08 +09:00
Mike Hommey
828d58eb4c Bug 609976 - Update removed-files.in to account for the removal of mozjs.dll. r=mshal 2014-10-18 09:28:59 +09:00
Robert Strong
43f38a791e Mac v2 signing - Bug 1076370 - Fix Firefox.app l10n repacks for Mac v2 signing. r=jmaher 2014-10-02 09:12:36 -07:00
Robert Strong
e6dcf41620 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
0ee5b4612e Mac v2 signing - Bug 1070149 - Add explicit file removals for channel-prefs.js, update-settings.ini, and precomplete files. r=spohl 2014-09-29 11:52:36 -07:00
Robert Strong
e401342c35 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
Benjamin Smedberg
acc347853a Bug 1063052 - in case a user ends up with unpacked chrome, on update use omni.ja again by removing chrome.manifest, r=rstrong r=glandium sr=dbaron 2014-09-17 11:21:14 -04:00
Robert Strong
91b7c88438 Most entries in removed-files.in are no longer needed - Bug 649607 - Update removed-files.in after requiring update to the version with bug 563318. r=bbondy 2013-09-17 22:15:53 -07:00
Carmen Jimenez
2171964928 Bug 893800 - Install single variant apps the first time a SIM is detected. r=fabrice 2013-07-31 21:34:19 +02:00
Xavier Fung
1dcc0c0757 Bug 888158 - Make configure to detect Visual Studio 2013 compiler. r=ted 2013-07-03 10:52:32 +09:00
Brandon Benvie
5a6d714476 bug 843094 - Remove the PropertyPanel; r=msucan 2013-05-03 11:39:00 -04:00
Eitan Isaacson
542d52e905 Bug 856370 - Add a Makefile.in in webspeech/recognition and remove webspeech top-level VPATH. r=smaug 
--HG--
rename : content/media/webspeech/Makefile.in => content/media/webspeech/recognition/Makefile.in
rename : content/media/webspeech/moz.build => content/media/webspeech/recognition/moz.build
 2013-04-03 15:13:16 -07:00
Nikhil Marathe
032f5a8a7b Bug 822712 - SimplePush - Implementation. r=dougt, jst, jlebar 2013-03-28 20:49:41 -07:00
Mike Hommey
347a7c2d09 Bug 852950 - Kill libxpcom. r=bsmedberg 
Also refactored the xpcom standalone glue to reside in a single file and
removed its use of realpath().

--HG--
rename : xpcom/stub/dependentlibs.py => toolkit/library/dependentlibs.py
rename : xpcom/stub/nsXPComStub.cpp => xpcom/build/FrozenFunctions.cpp
 2013-03-20 14:56:41 +01:00
Mike Hommey
8cf8cff7ce Backout changeset f12e5c87adf6 (bug 852950) because it breaks running from dist/bin 2013-03-20 23:59:45 +01:00
Mike Hommey
fa1c295631 Bug 852950 - Kill libxpcom. r=bsmedberg 
--HG--
rename : xpcom/stub/dependentlibs.py => toolkit/library/dependentlibs.py
rename : xpcom/stub/nsXPComStub.cpp => xpcom/build/FrozenFunctions.cpp
 2013-03-20 14:56:41 +01:00
Mike Hommey
ff9d05fb1f Bug 852068 - Update removed-files after bug 648407. r=ted 2013-03-19 06:28:40 +01:00
William Chen
1fbc9b3df5 Bug 782211 - Part 9: Remove native notification systems on desktop platforms. r=dougt 2013-03-18 06:24:55 -07:00
Gene Lian
3fd091d44a Bug 844429 - B2G SMS & MMS: move SMS codes into dom/mobilemessage to make it generic for MMS. r=vicamo 
--HG--
rename : dom/sms/interfaces/nsIDOMMozSmsEvent.idl => dom/mobilemessage/interfaces/nsIDOMMozSmsEvent.idl
rename : dom/sms/interfaces/nsIDOMMozSmsMessage.idl => dom/mobilemessage/interfaces/nsIDOMMozSmsMessage.idl
rename : dom/sms/interfaces/nsIDOMNavigatorSms.idl => dom/mobilemessage/interfaces/nsIDOMNavigatorSms.idl
rename : dom/sms/interfaces/nsIDOMSmsCursor.idl => dom/mobilemessage/interfaces/nsIDOMSmsCursor.idl
rename : dom/sms/interfaces/nsIDOMSmsFilter.idl => dom/mobilemessage/interfaces/nsIDOMSmsFilter.idl
rename : dom/sms/interfaces/nsIDOMSmsManager.idl => dom/mobilemessage/interfaces/nsIDOMSmsManager.idl
rename : dom/sms/interfaces/nsIDOMSmsRequest.idl => dom/mobilemessage/interfaces/nsIDOMSmsRequest.idl
rename : dom/sms/interfaces/nsIDOMSmsSegmentInfo.idl => dom/mobilemessage/interfaces/nsIDOMSmsSegmentInfo.idl
rename : dom/sms/interfaces/nsISmsRequest.idl => dom/mobilemessage/interfaces/nsISmsRequest.idl
rename : dom/sms/interfaces/nsISmsService.idl => dom/mobilemessage/interfaces/nsISmsService.idl
rename : dom/sms/src/Constants.cpp => dom/mobilemessage/src/Constants.cpp
rename : dom/sms/src/Constants.h => dom/mobilemessage/src/Constants.h
rename : dom/sms/src/SmsCursor.cpp => dom/mobilemessage/src/SmsCursor.cpp
rename : dom/sms/src/SmsCursor.h => dom/mobilemessage/src/SmsCursor.h
rename : dom/sms/src/SmsFilter.cpp => dom/mobilemessage/src/SmsFilter.cpp
rename : dom/sms/src/SmsFilter.h => dom/mobilemessage/src/SmsFilter.h
rename : dom/sms/src/SmsManager.cpp => dom/mobilemessage/src/SmsManager.cpp
rename : dom/sms/src/SmsManager.h => dom/mobilemessage/src/SmsManager.h
rename : dom/sms/src/SmsMessage.cpp => dom/mobilemessage/src/SmsMessage.cpp
rename : dom/sms/src/SmsMessage.h => dom/mobilemessage/src/SmsMessage.h
rename : dom/sms/src/SmsRequest.cpp => dom/mobilemessage/src/SmsRequest.cpp
rename : dom/sms/src/SmsRequest.h => dom/mobilemessage/src/SmsRequest.h
rename : dom/sms/src/SmsSegmentInfo.cpp => dom/mobilemessage/src/SmsSegmentInfo.cpp
rename : dom/sms/src/SmsSegmentInfo.h => dom/mobilemessage/src/SmsSegmentInfo.h
rename : dom/sms/src/SmsServicesFactory.cpp => dom/mobilemessage/src/SmsServicesFactory.cpp
rename : dom/sms/src/SmsServicesFactory.h => dom/mobilemessage/src/SmsServicesFactory.h
rename : dom/sms/src/Types.h => dom/mobilemessage/src/Types.h
rename : dom/sms/src/android/SmsService.cpp => dom/mobilemessage/src/android/SmsService.cpp
rename : dom/sms/src/android/SmsService.h => dom/mobilemessage/src/android/SmsService.h
rename : dom/sms/src/fallback/SmsService.cpp => dom/mobilemessage/src/fallback/SmsService.cpp
rename : dom/sms/src/fallback/SmsService.h => dom/mobilemessage/src/fallback/SmsService.h
rename : dom/sms/src/ipc/PSms.ipdl => dom/mobilemessage/src/ipc/PSms.ipdl
rename : dom/sms/src/ipc/PSmsRequest.ipdl => dom/mobilemessage/src/ipc/PSmsRequest.ipdl
rename : dom/sms/src/ipc/SmsChild.cpp => dom/mobilemessage/src/ipc/SmsChild.cpp
rename : dom/sms/src/ipc/SmsChild.h => dom/mobilemessage/src/ipc/SmsChild.h
rename : dom/sms/src/ipc/SmsIPCService.cpp => dom/mobilemessage/src/ipc/SmsIPCService.cpp
rename : dom/sms/src/ipc/SmsIPCService.h => dom/mobilemessage/src/ipc/SmsIPCService.h
rename : dom/sms/src/ipc/SmsParent.cpp => dom/mobilemessage/src/ipc/SmsParent.cpp
rename : dom/sms/src/ipc/SmsParent.h => dom/mobilemessage/src/ipc/SmsParent.h
rename : dom/sms/src/ipc/SmsTypes.ipdlh => dom/mobilemessage/src/ipc/SmsTypes.ipdlh
rename : dom/sms/src/ipc/ipdl.mk => dom/mobilemessage/src/ipc/ipdl.mk
rename : dom/sms/src/ril/SmsService.cpp => dom/mobilemessage/src/ril/SmsService.cpp
rename : dom/sms/src/ril/SmsService.h => dom/mobilemessage/src/ril/SmsService.h
rename : dom/sms/tests/Makefile.in => dom/mobilemessage/tests/Makefile.in
rename : dom/sms/tests/marionette/manifest.ini => dom/mobilemessage/tests/marionette/manifest.ini
rename : dom/sms/tests/marionette/test_between_emulators.py => dom/mobilemessage/tests/marionette/test_between_emulators.py
rename : dom/sms/tests/marionette/test_bug814761.js => dom/mobilemessage/tests/marionette/test_bug814761.js
rename : dom/sms/tests/marionette/test_emulator_loopback.js => dom/mobilemessage/tests/marionette/test_emulator_loopback.js
rename : dom/sms/tests/marionette/test_filter_date.js => dom/mobilemessage/tests/marionette/test_filter_date.js
rename : dom/sms/tests/marionette/test_filter_date_notfound.js => dom/mobilemessage/tests/marionette/test_filter_date_notfound.js
rename : dom/sms/tests/marionette/test_filter_mixed.js => dom/mobilemessage/tests/marionette/test_filter_mixed.js
rename : dom/sms/tests/marionette/test_filter_number_multiple.js => dom/mobilemessage/tests/marionette/test_filter_number_multiple.js
rename : dom/sms/tests/marionette/test_filter_number_single.js => dom/mobilemessage/tests/marionette/test_filter_number_single.js
rename : dom/sms/tests/marionette/test_filter_read.js => dom/mobilemessage/tests/marionette/test_filter_read.js
rename : dom/sms/tests/marionette/test_filter_received.js => dom/mobilemessage/tests/marionette/test_filter_received.js
rename : dom/sms/tests/marionette/test_filter_sent.js => dom/mobilemessage/tests/marionette/test_filter_sent.js
rename : dom/sms/tests/marionette/test_filter_unread.js => dom/mobilemessage/tests/marionette/test_filter_unread.js
rename : dom/sms/tests/marionette/test_getmessage.js => dom/mobilemessage/tests/marionette/test_getmessage.js
rename : dom/sms/tests/marionette/test_getmessage_notfound.js => dom/mobilemessage/tests/marionette/test_getmessage_notfound.js
rename : dom/sms/tests/marionette/test_getmessages.js => dom/mobilemessage/tests/marionette/test_getmessages.js
rename : dom/sms/tests/marionette/test_incoming.js => dom/mobilemessage/tests/marionette/test_incoming.js
rename : dom/sms/tests/marionette/test_incoming_delete.js => dom/mobilemessage/tests/marionette/test_incoming_delete.js
rename : dom/sms/tests/marionette/test_incoming_max_segments.js => dom/mobilemessage/tests/marionette/test_incoming_max_segments.js
rename : dom/sms/tests/marionette/test_incoming_multipart.js => dom/mobilemessage/tests/marionette/test_incoming_multipart.js
rename : dom/sms/tests/marionette/test_mark_msg_read.js => dom/mobilemessage/tests/marionette/test_mark_msg_read.js
rename : dom/sms/tests/marionette/test_mark_msg_read_error.js => dom/mobilemessage/tests/marionette/test_mark_msg_read_error.js
rename : dom/sms/tests/marionette/test_message_classes.js => dom/mobilemessage/tests/marionette/test_message_classes.js
rename : dom/sms/tests/marionette/test_outgoing.js => dom/mobilemessage/tests/marionette/test_outgoing.js
rename : dom/sms/tests/marionette/test_outgoing_delete.js => dom/mobilemessage/tests/marionette/test_outgoing_delete.js
rename : dom/sms/tests/marionette/test_outgoing_max_segments.js => dom/mobilemessage/tests/marionette/test_outgoing_max_segments.js
rename : dom/sms/tests/marionette/test_segment_info.js => dom/mobilemessage/tests/marionette/test_segment_info.js
rename : dom/sms/tests/marionette/test_strict_7bit_encoding.js => dom/mobilemessage/tests/marionette/test_strict_7bit_encoding.js
rename : dom/sms/tests/moz.build => dom/mobilemessage/tests/moz.build
rename : dom/sms/tests/test_sms_basics.html => dom/mobilemessage/tests/test_sms_basics.html
rename : dom/sms/tests/test_smsdatabaseservice.xul => dom/mobilemessage/tests/test_smsdatabaseservice.xul
rename : dom/sms/tests/test_smsfilter.html => dom/mobilemessage/tests/test_smsfilter.html
rename : dom/sms/tests/test_smsservice_createsmsmessage.js => dom/mobilemessage/tests/test_smsservice_createsmsmessage.js
rename : dom/sms/tests/xpcshell.ini => dom/mobilemessage/tests/xpcshell.ini
 2013-03-01 16:38:47 +08:00
Ryan VanderMeulen
57dcf876ff Backout 35d48d9d80d5 (bug 752982) for landing without proper review. 2013-02-11 14:33:27 -05:00
Shih-Chiang Chien
eede229339 Bug 752982 - Part 1: Implement captive portal detection service. r=thinker 2012-09-15 11:37:53 +08:00
Phil Ringnalda
2b3d881d7c Merge m-c to s-c 2013-02-04 18:12:00 -08:00
Richard Newman
eab35762ba Bug 836206 - Remove AITC client. r=gps 2013-02-03 00:51:26 -08:00
Fabrice Desré
affdca43f1 Bug 835548 - Refactor BrowserElementParent.js into a .js and .jsm, and speed up message registration. r=jlebar 
--HG--
rename : dom/browser-element/BrowserElementParent.js => dom/browser-element/BrowserElementParent.jsm
 2013-01-30 14:22:54 -08:00
Mike Hommey
5ad44af9bd Bug 780561 - Use new packager code for packaging (packager.mk) r=ted 2013-01-23 11:23:15 +01:00
Jeff Muizelaar
91cbf694b0 Bug 808785. Stop shipping d3dx9_43.dll. r=bjacob 
Since ANGLE revision 1314 / issue 311:
http://code.google.com/p/angleproject/issues/detail?id=311 d3dx9_43.dll is no
longer needed.

--HG--
extra : rebase_source : cb02a61730f4a24f807662269693be2dde673ff0
 2013-01-28 11:52:06 -05:00
Gregory Szorc
57f274b2a8 Bug 828829 - Refactor Health Report policy out of services/healthreport; r=rnewman 
--HG--
rename : services/healthreport/HealthReportService.js => services/datareporting/DataReportingService.js
rename : services/healthreport/modules-testing/mocks.jsm => services/datareporting/modules-testing/mocks.jsm
rename : services/healthreport/policy.jsm => services/datareporting/policy.jsm
rename : services/healthreport/tests/xpcshell/test_policy.js => services/datareporting/tests/xpcshell/test_policy.js
extra : rebase_source : cf766bc99ff843f2d31f82b1c4be71313fbc65a8
 2013-01-11 13:45:22 -08:00
Gregory Szorc
97aca5f790 Bug 791869 - Remove services/notifications; r=rnewman 2013-01-06 12:04:59 -08:00
Jim Mathies
a3d3dce834 Bug 817076 - Update package manifests to new service locations and key PREF_DIR location off DIST_SUBDIR. r=glandium 2012-12-05 16:36:15 -06:00
Mike Hommey
b63355129b Bug 809802 - Only list update.locale in removed-files when building with omnijar. r=khuey. DONTBUILD 2012-12-05 09:21:07 +01:00
Mike Hommey
27eb257250 Backout changeset bd9307cf2ed7 because of wrong bug number. 2012-12-05 09:30:36 +01:00
Mike Hommey
41dacf105f Bug 809803 - Only list update.locale in removed-files when building with omnijar. r=khuey 
--HG--
extra : rebase_source : 190402e04873a8297b8f94e5fb0892a5f937e22f
 2012-12-05 09:21:07 +01:00
Patrick McManus
d70af841f6 bug 769764 move proxy resolution to separate thread and remove sync api r=biesi sr=josh 2012-09-14 16:27:46 -04:00
Justin Dolske
814df6986d Bug 789849 - Use PNG instead of TIFF for cursor/pointer resources. r=josh 2012-09-19 14:39:25 -07:00
Ed Morley
fb64dc10dd Backout 6d71ff5b4b36 (bug 347307), 75a3c47a3fe7 (bug 507578), 828f91de7143 (bug 769764) for near permaorange OS X 10.8 leaks 2012-09-17 16:54:09 +01:00
Patrick McManus
d64080bb5a bug 769764 move proxy resolution to separate thread and remove sync api r=biesi sr=josh 2012-09-14 16:27:46 -04:00
Ed Morley
483772a3a4 Backout 3182f9d08c2d (bug 347307), 2a30593cca79 (bug 507578), b87b27f5a417 (bug 769764) for m-oth permaorange in browser_463205.js 2012-09-13 22:42:29 +01:00
Patrick McManus
2fbed15e29 bug 769764 move proxy resolution to separate thread and remove sync api r=biesi sr=josh 2012-09-13 15:22:56 -04:00
Mark Banner
45f716ebb7 Bug 715089 run-mozilla.sh doesn't need to be shipped for Mac. r=ted 2012-09-04 21:26:54 +01:00
Ben Hearsum
7ced94d219 bug 783241: add extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png to removed-files.in. r=ted/bmcbride 2012-08-16 10:03:18 -04:00
Jim Mathies
2ec2dca08f Bug 770896 - include vccorlib110 redist library in installs for metro. r=rstrong 2012-07-09 15:48:29 -05:00
Ryan VanderMeulen
5f2a19ee6e Revert c39d36167b99 due to a horribly munged backout. 2012-06-10 19:44:50 -04:00
Ryan VanderMeulen
6d6c4efbab Backout the bug 754202 backout due to orange. 2012-06-10 19:37:47 -04:00
Yury
cd28ca362e Bug 758291 - Add uriloader@pdf.js.xpi to removed-files. r=dtownsend 2012-06-09 17:07:19 -04:00
Justin Lebar
5fb435f5c4 Bug 741587 - Part 1: Make alert/prompt/confirm work with <iframe mozbrowser>. r=smaug 
--HG--
extra : rebase_source : f418da542453f8b0f5853a8da48bea1c8c95969e
 2012-06-07 10:43:23 -04:00
Gervase Markham
68d38d677f Bug 759095 - upgrade license to MPL 2, and other licensing cleanups. 
--HG--
extra : rebase_source : da55a4937383eda2baf7c9a362501da8ee664146
 2012-05-29 16:52:43 +01:00
Doug Turner
236a04a91a Bug 717103 - Implement Device Storage. r=sicking 2012-05-21 09:18:30 -07:00
Ed Morley
273380866f Backout 027ed1748c81 (bug 740485) for M3 orange 2012-05-21 19:36:43 +01:00
Doug Turner
f8a704e7d4 Bug 740485 - Implement Device Storage. r=sicking 2012-05-21 09:18:30 -07:00