Brad Gonzales
af191df5cf
Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
...
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30
Former-commit-id: 59f22b866a73e757c28459f22b866a73e757c28461448cc04a61448cc04aaff77aa14855d242b86db24299e301
2013-10-09 17:58:12 -05:00
David Gillingham
47ff31848c
Issue #2418 : Fix parameter naming issue in PHISH parameter info file.
...
Change-Id: I96dc326eba20ffa7c267248fd12343347e1ea93b
Former-commit-id: 5e2157c933dda31532a45e2157c933dda31532a4d0091e0f84d0091e0f842ae3f7b9f3303a8802ef9fb19d2b4c
2013-10-09 14:44:55 -05:00
Ron Anderson
bc4bd47b90
Merge "Issue #2418 : Add display support for pSurge 2.0 data in GFE." into development
...
Former-commit-id: e8e47e87b0f3118d421ce8e47e87b0f3118d421cd66c9d7322d66c9d73225812db03e25cea601f855b27c23897
2013-10-09 14:00:21 -05:00
Richard Peter
28ae696899
Merge "Issue #2402 Modify grib decoder to work on file extents. Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9" into development
...
Former-commit-id: fcb0b32ae2d8df407119fcb0b32ae2d8df407119117c82a06d117c82a06d52c9791172a6f7a7ca7f5eaa25b609
2013-10-09 13:13:18 -05:00
Ben Steffensmeier
870631902b
Issue #2402 Modify grib decoder to work on file extents.
...
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9
Former-commit-id: c896c9bf307d2b48de48c896c9bf307d2b48de482b089b08482b089b08487c6a89b623633a075052839c602669
2013-10-09 12:50:02 -05:00
Ben Steffensmeier
236be63083
Issue #2457 Improve error messages for missing radar icao.
...
Former-commit-id: c43f3e11a652beccc5c9c43f3e11a652beccc5c97c8a3b80fa7c8a3b80fa18c59f3573070e2cfdac2edbb6e665
2013-10-09 12:11:27 -05:00
Nate Jensen
4988c3b715
Merge "Issue #2402 Make PythonDecoder more extendable." into development
...
Former-commit-id: e0cbf2e05f7cecf177fee0cbf2e05f7cecf177fe2d25d9e46a2d25d9e46ac026672fe19ca9bd05a075f9f891a7
2013-10-08 16:20:43 -05:00
Richard Peter
bc32641181
Merge branch 'omaha_13.5.3' (13.5.2-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371
Former-commit-id: f141fdd5ab9adbe25cebf141fdd5ab9adbe25cebb6395cc834b6395cc8340e7dccd18f3abe952ca01895c9f914
2013-10-08 10:59:50 -05:00
Richard Peter
b2b7521cab
Merge "Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects" into development
...
Former-commit-id: f7ae6aae9228760a1273f7ae6aae9228760a12737a4ed8bea47a4ed8bea4f28a0c025e0b1f6e2c9b9abed1e51e
2013-10-08 10:50:59 -05:00
Dave Hladky
de24cf3b9a
Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects
...
Former-commit-id: 4867082be1fbe4078bc54867082be1fbe4078bc5ad1bb73c70ad1bb73c70445d836fe6093b41499b7807722694
2013-10-08 10:25:36 -05:00
Richard Peter
d321c61259
Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
Former-commit-id: f0c05dc6d831c87ab01ef0c05dc6d831c87ab01ed9eae3ea28d9eae3ea2894d0913bd9f4b47dda5033b4f0c247
2013-10-08 09:45:27 -05:00
Max Schenkelberg
8727dcb949
Issue #2081 Created custom dataURI field converter interface for use with DataTime so toString can be left unchanged (with spaces) and dataTimes in the dataURI will also be left unchanged (with underscores). Refactored DataURIUtil to support these new field converters.
...
Change-Id: I0a3983b04a475f6fcf5f70ee89cecf6dd2e67676
Former-commit-id: 0e1a4fdf961bc2e9aa2b0e1a4fdf961bc2e9aa2b782ec43213782ec43213347fd2bfe0d1e5c9d9e21cc4b105e9
2013-10-08 09:34:08 -05:00
Brad Gonzales
0313e9c835
Issue #2267 Shared Subscription fixes. DataDelivery Port environment standardization. Logging updates.
...
Amend: Refactored WMO header applier.
Fixes for WMO header applier.
Updated dataDeliveryRetrieval.xml with correct wmo header pattern.
Removed manual ingest from registry mode.
Simplified data delivery distribution matching pattern.
Added serialize test for wfs response.
Updated comments.
Moved WfsRetrievalResponse to com.raytheon.uf.edex.datadelivery.retrieval package.
Added WfsRetrievalResponse to Jaxb unmarshalable classes in DeserializeRetrievedDataFromIngest.
HibernateBandwidthInitializer.executeAfterRegistryInit(), in NCF mode schedules shared subs.
Change-Id: I0278339701f5f55491120c35d80cbd6d3dcc84f7
Former-commit-id: dc45b582e121acb75f24dc45b582e121acb75f24a6540d69eaa6540d69eae129c33bee9d981ab2f30f3b5172d4
2013-10-07 17:06:38 -05:00
Richard Peter
cf210025ae
Merge "Issue #2385 Fixed subscription backup web page" into development
...
Former-commit-id: 540d0e7b9c9e17d68bd1540d0e7b9c9e17d68bd1472b3b10a3472b3b10a30306778ac2eb5b61ba85a02af3bc08
2013-10-07 16:21:46 -05:00
Richard Peter
54dc5aa82c
Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
...
Former-commit-id: 9d424c212b2e062048e19d424c212b2e062048e1e2c7bb21d7e2c7bb21d780dd506d10e43cd4b3977ef56bfc43
2013-10-07 16:19:11 -05:00
Nate Jensen
2096477ed6
Merge "Issue #2361 remove XML annotations from IHFS table classes" into development
...
Former-commit-id: 96687f720fbe30e6da8996687f720fbe30e6da895b0e80322a5b0e80322aaf56367b95571c69f4a092f3b9cfa9
2013-10-07 14:21:40 -05:00
Nate Jensen
e86afaee6d
Issue #2361 remove XML annotations from IHFS table classes
...
Change-Id: I10c3fb7aeec4ec96a17d54ee388c4b0770e9e939
Former-commit-id: f2dd7d28e155a39d6458f2dd7d28e155a39d6458ded2e8a852ded2e8a852e40465105c1d3b896c05e267e0336b
2013-10-07 13:06:05 -05:00
Richard Peter
74b976232c
Issue #2357 : Remove edex jms resource reuse by other threads.
...
Change-Id: I73f5a01f2d943bb9f7f4e51028cc16bfcee3d823
Former-commit-id: c146f90a09be99174b65c146f90a09be99174b65802ab87e57802ab87e577dc61aceee5320536f5491bf400b6a
2013-10-07 12:38:08 -05:00
Benjamin Phillippe
dc4b2c7ac3
Issue #2385 Fixed subscription backup web page
...
Change-Id: I06905712f279f487ac8298ab40ca22a012d01dbf
Former-commit-id: ce3e85e4d42759456eb4ce3e85e4d42759456eb45e72b8fa2e5e72b8fa2e4fef3dad20323d9f40dab25530ea61
2013-10-07 09:52:47 -05:00
Nate Jensen
3d36bc8ee5
Merge "Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject" into development
...
Former-commit-id: be1385b705adc774bee9be1385b705adc774bee9c36c50d189c36c50d18901997dd1fb10ba6f231a315026f786
2013-10-07 09:30:31 -05:00
David Gillingham
c281c6be1b
Issue #2418 : Add display support for pSurge 2.0 data in GFE.
...
Change-Id: Ifbd6df0247c26ea250cd52430211c51cf71c7381
Former-commit-id: 8bc13256260fba91a9858bc13256260fba91a9858eba0e3dea8eba0e3deae9d6191c98aae6f4a6347be13ee945
2013-10-04 12:58:07 -05:00
Dave Hladky
ab9c5af250
Issue #1797 Separation of gridded time and abstract time object
...
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63
Former-commit-id: 4d4d93fc0ae0ec10d0734d4d93fc0ae0ec10d0731733834e741733834e7421239525ea89c341509c3ba8fd56f7
2013-10-04 10:36:27 -05:00
Steve Harris
e1f7463a41
13.5.2-8 baseline
...
Former-commit-id: 8ba7d392d694aa71fcd18ba7d392d694aa71fcd118325949fb18325949fb21b84f0290d89fbf73d9088eb89ca7
2013-10-04 11:30:03 -04:00
Ben Steffensmeier
edeb2950ad
Issue #2402 Make PythonDecoder more extendable.
...
Former-commit-id: f848fa2218a5a0bf72b6f848fa2218a5a0bf72b6058b32eaec058b32eaecd0c330f5a22bccf6a62ddcc0043064
2013-10-03 18:19:04 -05:00
Richard Peter
19e860f9a8
Merge "Issue #2390 update grib decoder and vb to handle new storm surge parameters. Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209" into development
...
Former-commit-id: f52fdf19165adf4298eff52fdf19165adf4298efbc3843dc75bc3843dc758694f13766f7a7228e092af4638a97
2013-10-03 16:57:39 -05:00
Ben Steffensmeier
8187fb1fa8
Issue #2390 update grib decoder and vb to handle new storm surge parameters.
...
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209
Former-commit-id: 7f7aa20d0a236b3fe05f7f7aa20d0a236b3fe05f8f94e1434c8f94e1434c69eec8d4c6d4670d19b19a0a15ffd8
2013-10-03 16:30:13 -05:00
Nate Jensen
3a28687ca2
Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject
...
Change-Id: Ic5e4926d97629e9f43990d1585da59eb7ef30650
Former-commit-id: ee134db1303f24b9e424ee134db1303f24b9e42442fee320ab42fee320ab82e0af6a9c160d1fbb0125bdea7759
2013-10-03 15:18:55 -05:00
Roger Ferrel
7bb7770fbf
Issue #2326 Added user roles for Archive case and retention.
...
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967
Former-commit-id: c959cedd997f7064d457c959cedd997f7064d45742705e4dfa42705e4dfa220769dab04c27adcc53029eec5dc4
2013-10-03 12:33:26 -05:00
Max Schenkelberg
6e5873733e
Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness
...
Amend: Accepted ticket.
Change-Id: Ib8171694869f60b46fb38634e71de61eb0e76830
Former-commit-id: 780ac0129fe3f6b1ea21780ac0129fe3f6b1ea21866c851b47866c851b4743b7cb3107ba25f56dbe80efdbb2b4
2013-10-03 11:43:26 -05:00
Bryan Kowal
767466a8fe
Issue #2295 - CAVE updates for ALR
...
- Amend: relocated qpid connection string comment
- Amend: replaced stacktrace printing with UFStatus
- Amend: removed unused code
- Amend: ThinClientNoficationManagerJob JavaDoc
Change-Id: I091aa29700378149e8eb09dcd11cdfc020e96c76
Former-commit-id: 4342c463b2aa8691edfd4342c463b2aa8691edfd4e4405b0f54e4405b0f56c60d06f9fa727bf39274ce26acc3b
2013-10-02 15:49:17 -05:00
Bryan Kowal
58ed2e7ae7
Issue #2272 - EDEX updates for ALR
...
- added an EDEX ingest hydro mode
- a cluster task can now be specified via an EDEX properties file
- Amend: added purge-logs to hydro ingest
- Amend: created the hydro request mode
- Amend: created environment properties files for the new EDEX instances
- Amend: cluster prefix is now defined statically
Change-Id: Ic60c988751cf75b9433c11fa71c04ab5190f6369
Former-commit-id: 60c544c7a926cf5dad6060c544c7a926cf5dad6073690a97aa73690a97aa6162beb8e086e0b3480f6db57eb23e
2013-10-02 15:49:16 -05:00
Greg Armendariz
48595626a4
Merge "Issue #2142 fix hibernate log" into development
...
Former-commit-id: 1c7dcca53416e36817cf1c7dcca53416e36817cff7b6c60ee6f7b6c60ee618f6b66b7ab2c2fcb96813fbc8b6ef
2013-10-02 15:32:54 -05:00
Nate Jensen
fc53dae5f8
Issue #2142 fix hibernate log
...
Change-Id: I20cfbaacd210ec43f6228d094669b34224862549
Former-commit-id: 5e48cfdd9dee3550654b5e48cfdd9dee3550654b687e64dc29687e64dc29a97cd93f95db35be851e729678f323
2013-10-02 15:30:52 -05:00
Nate Jensen
a0340f2a82
Merge "Issue #2404 move grid reprojection style rules to common." into development
...
Former-commit-id: 028165eace4564a94369028165eace4564a943696bc326b8d16bc326b8d114d7cc21e1d7a8341832549f2b33ba
2013-10-02 11:21:04 -05:00
Ben Steffensmeier
ff28df9bbc
Issue #2404 move grid reprojection style rules to common.
...
Former-commit-id: a95f0dbac4a75361ad34a95f0dbac4a75361ad3432a01070f932a01070f995b1c0165059d7c79c20dc4c07c194
2013-10-02 10:33:23 -05:00
Nate Jensen
c18e9ee060
Issue #2361 remove XML annotations from localization requests/responses
...
Change-Id: Ia2aa791f7e68524d19f24522c7824a977d25d58f
Former-commit-id: 8e17babd91dd75847b7b8e17babd91dd75847b7b396e69180d396e69180d28ce7782fe3b92de5abc38edfa0d07
2013-10-02 09:09:26 -05:00
Roger Ferrel
efde4f9297
Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
...
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859
Former-commit-id: 2ba7117d13a76fc08e932ba7117d13a76fc08e93e65b8a9f6ee65b8a9f6e34ea90f18a71737f069d0d86e00182
2013-10-01 16:36:34 -05:00
Richard Peter
541ff7c791
Merge "Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive." into omaha_13.5.3
...
Former-commit-id: 5a3d77f26f463c07c3de5a3d77f26f463c07c3de59061263d259061263d233a53e5b2a7309d7d8362a86df5796
2013-10-01 15:31:12 -05:00
Nate Jensen
580f3be05d
Merge "Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager" into development
...
Former-commit-id: 68c8f9addd265b6e7e6168c8f9addd265b6e7e616cd79464ef6cd79464efc4018373f164d66cf406ff27201982
2013-10-01 15:19:56 -05:00
Richard Peter
86c28e6e16
Merge branch 'omaha_13.5.3' (13.5.2-7) into development
...
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50
Former-commit-id: 75b0f19d87bb9488bb9275b0f19d87bb9488bb92f4e71b65d3f4e71b65d33514194d3b39ae6d437dddf07f8030
2013-10-01 15:06:34 -05:00
Richard Peter
32dd0fedc1
Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml
Former-commit-id: 984785ce5ee45689dbc7984785ce5ee45689dbc7add32a774fadd32a774faa2eda2c38c178e4543a06737e3fa2
2013-10-01 14:22:33 -05:00
Nate Jensen
0c92f4eca1
Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager
...
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7
Former-commit-id: f529c077c6effa4f4f26f529c077c6effa4f4f263e7dc7782f3e7dc7782fe1c35952c94e6f5afc57593700bd28
2013-10-01 11:25:45 -05:00
Roger Ferrel
d5626a0591
Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive.
...
Change-Id: I00ab0a44e37d4e9898aa256f4963c34ed8ae1f48
Former-commit-id: 93ce65763ee8be9f980a93ce65763ee8be9f980a546c051e35546c051e353466232f8df01f8e9eb4213127601d
2013-09-30 16:45:32 -05:00
Steve Harris
79d71e33d0
13.5.2-7 baseline
...
Former-commit-id: b5cb6936190f8fc513bfb5cb6936190f8fc513bfa212c30bd7a212c30bd706ba0dbf6c02d61457825e4023b974
2013-09-30 13:05:31 -04:00
Benjamin Phillippe
bfac3e7977
Issue #2191 Fixing Registry Federation
...
Change-Id: Ibf3dec6af45424bc8678a37f00b070d3032bb7de
Former-commit-id: 1c9f237245f76c747a011c9f237245f76c747a01ac44137242ac4413724283cbecc94ecc1c27ea936e249902d4
2013-09-30 10:16:03 -05:00
Brian Clements
6cb6d468fe
Issue #2404 Moved colormap parameter factory to common
...
moved grid level translator from viz to common
updated references to moved classes
created grid style util for common styling code
updated style manager to look in common for files
moved data plugin style rules to common
Former-commit-id: 4c5d2b051d2f25116c104c5d2b051d2f25116c1075448f8a4275448f8a42fedd0dc781e8cc15940c0ba625fbe6
2013-09-27 09:41:51 -05:00
Nate Jensen
a3cfe6903a
Merge "Issue #2386 Backend work for adding multiple types to Subscription overlap rules Change-Id: I0779dc7987031999b80ab0859c7f33dca20a5c17" into development
...
Former-commit-id: 51bf49f6b5291cd5342651bf49f6b5291cd53426c40bedaaf9c40bedaaf9daff685991a865c6b706e5d98833b1
2013-09-27 09:39:54 -05:00
Nate Jensen
9296ad509b
Merge "Issue #2081 Removed the special case handling of spaces in dataURIs. Provided upgrade script for data types that have underscores in their dataURIs that should be spaces." into development
...
Former-commit-id: 37beaaadc1692a15a92f37beaaadc1692a15a92f06631d85f606631d85f65d3eecfb254a7b73943a40c0a64490
2013-09-26 17:31:26 -05:00
Nate Jensen
e7e734f80c
Merge "Issue #2250 fix for Python PathManager not correctly closing" into development
...
Former-commit-id: 51785dc207238936fe6351785dc207238936fe6371dfb4d01e71dfb4d01eeb6866e7e18bd7aa39424c76645ccf
2013-09-26 14:53:49 -05:00
Max Schenkelberg
9c906f67cb
Issue #2081 Removed the special case handling of spaces in dataURIs. Provided upgrade script for data types that have underscores in their dataURIs that should be spaces.
...
Amend: Fixed working directory issue
Amend: Added comments and encoded '%' character as well as '/'
Change-Id: I5297d35e1cbc33ee8d2af24da02b101bb6b766ba
Former-commit-id: fb6b1d3af1b0416f43bafb6b1d3af1b0416f43bae7220b37e6e7220b37e6972b7a1d3a9243407623600eb7a3a6
2013-09-26 14:51:07 -05:00
