Brian.Dyke
97dfb04eb6
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 1f186fb314e78d93adefe03faaa71f348ee207c7
2014-09-17 13:32:25 -04:00
Roger Ferrel
a560d254f8
Omaha #3609 Correct same spelling as in 14.3.1-backports
...
Former-commit-id: 80c6046ef27f08bad8c7d11ddafcc6a1adaa6096
2014-09-17 11:31:01 -05:00
Brian Clements
0808a6b662
Omaha #3632 fixed index out of bounds for TCSResource
...
Change-Id: I1d0811d2565441a01b104a1ad2a1c1303c756907
Former-commit-id: 1c96a60c25091ddec997f5d9e3b604c0fd7689bc
2014-09-17 11:16:55 -05:00
Brian Clements
6fd51c01fe
Omaha #2707 LSR rework
...
removed dataURI column from DB
removed eventType from hdf5
eventType in DB now string
unknown event types now render direct
Change-Id: I24f5041f761758371dcef1fd1157be0bcf329e73
Former-commit-id: 9950454fbe4158bcfcb9d3ce25abafad4d012556
2014-09-17 10:57:07 -05:00
Qinglu.Lin
5e93999662
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: e7ab29fbfebb1943e0b0702547dbd353367e797d
2014-09-17 10:26:25 -04:00
Ron Anderson
d8471fce1f
Issue #3592 Fix issue with priority of file updates
...
Change-Id: I1404fc8f3c03fab7e828bf40ee01c8d03cfbda58
Former-commit-id: 554ea4118615055d4f2e0d80c58788f55c4b41e9
2014-09-16 17:25:43 -05:00
Ron Anderson
19bd85af5e
Issue #3592 Significantly reworked SampleSetManager and sample set dialogs to better match A1 behavior.
...
Change-Id: I8aef618a5091ee7acae470f5729add3c44287f30
Former-commit-id: bb859073c6ab56141434b84dc104857759a81d82
2014-09-16 13:20:40 -05:00
Brian.Dyke
aa5d314407
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: f08b8e1a7f684c419abe7995dc3441e6d38b79ce
2014-09-16 10:53:58 -04:00
Matthew Howard
4786f2e19e
Merge "ASM #529 Invalid QC message for Areal Flood Advisory" into asm_14.3.1
...
Former-commit-id: f08b93fb1bd32ec83a2e590d29d5e4d0fe18c0a9
2014-09-16 08:32:37 -05:00
Michael Gamazaychikov
0b245d40ae
ASM #529 Invalid QC message for Areal Flood Advisory
...
Change-Id: I392d32b4d7ccc94c88404a85f22f2f306d34ee33
Former-commit-id: d3247df563831f017f69faf1edbde5aea3c2a507
2014-09-16 09:12:06 -04:00
Steve Harris
57f0a992d9
Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
...
Former-commit-id: 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf
2014-09-15 21:13:56 -05:00
Jordan Gerth
8f5903920c
VLab Issue #4487 - Dim. DR 17313, Additional true color capabilities; fixes #4487
...
Change-Id: I701f302aa5958e89522208fd7915f5077cf97616
Former-commit-id: 1300009502bafd34fee13c8d21d65208b1069bda
2014-09-15 19:14:13 -05:00
Slav Korolev
65d1cca6fd
Issue #2757 - Removed unnecessary dialogs.
...
Former-commit-id: 1a906e4f7a5e7cc9e4cd8b4a717f0f2bb02cbb61
2014-09-15 17:46:10 -04:00
Matthew Howard
6e0d48d840
Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1
...
Former-commit-id: f33abc302597a3120c9220278e28d865d5f185b6
2014-09-15 15:03:36 -05:00
Daniel.Huffman
0f30c0f897
ASM #641 - Filtered cases where Areas do not match Zones.
...
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362
Former-commit-id: bf6acaafc42ba98e4257d3eb089b7a1e7adf7bd4
2014-09-15 19:18:33 +00:00
Roger Ferrel
bab69dc58c
Omaha #3353 Fix null pointer opening GenerateGeoDataSetDialog.
...
Former-commit-id: f7fe3c9351d354046ef5038ae561db469421a442
2014-09-15 13:00:02 -05:00
Matthew Howard
155df2bedc
Merge "ASM #16693 - Fix spelling checker suggests swear words" into asm_14.3.1
...
Former-commit-id: 04c6dfae9b8edb836a1bad54e1b8b327c66325bb
2014-09-15 12:28:25 -05:00
Stephen Gilbert
440bddda4b
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Former-commit-id: 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3
2014-09-15 13:20:34 -04:00
Ying-Lian.Shi
6e88d5f39c
ASM #16693 - Fix spelling checker suggests swear words
...
Change-Id: Ie9e5bc5c26b16655185b81cf4b4cf2f758693566
Former-commit-id: 094cb9dba5d6e0da22b32b85dcc5049fd629fe5e
2014-09-15 14:56:32 +00:00
Brian.Dyke
1541e4c255
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 8e4f6e96f7b70d6f2b7517f3f0695350506169c7
2014-09-15 10:46:25 -04:00
Brian Clements
06a6124b64
Omaha #3531 added localization perspective link to volume browser menus
...
Change-Id: I876d3c562a6c7d9d02396519d1d214a97ffa5be9
Former-commit-id: b25d8f970caa04375f27f30d86df07542783e24a
2014-09-15 09:13:20 -05:00
Roger Ferrel
28347129a1
Issue #3516 ColorMapTree change listener now only gets colormaps changes.
...
Change-Id: Id19d0c0e958ec64a19abc064817780d067add023
Former-commit-id: bb265611d13e6cb9812aca3966d9fe2a20990a36
2014-09-12 15:03:13 -05:00
Mark Peters
b8dc6d37d8
Omaha #3580 Replace or remove Text Workstation calls to SerializationUtil's JAXB support
...
Change-Id: Id12d02ebf40cd7c7a1236d88a3776b6a3ee1df3c
Former-commit-id: 4d5b0516d227eb7b892850753c6bb94f67f01a2d
2014-09-12 13:23:40 -05:00
Brian.Dyke
83099ee81f
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: ab9b7ec5424512656d2fb343773fa97658c04ecd
2014-09-12 14:11:57 -04:00
Ana Rivera
909f4d8632
VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671
...
Change-Id: I9708b606e5a7d2c2fc9355d765fbad9113a40493
Former-commit-id: 94e5089beb782011d107de4aeeb8b35694f2f5c3
2014-09-11 21:17:43 +00:00
Roger Ferrel
246bc4770f
Issue #3516 - Get Color Maps for levels off the dispatch thread.
...
Change-Id: Icc89f4860eef0b0b404e1e5b66bb0178eedd73dc
Former-commit-id: a67a429eb2d266e66a99b6c18916193cd0d20d9d
2014-09-11 14:36:50 -05:00
Brian Clements
c56645dd01
Omaha #3608 improved error handling in lightning frame retriever
...
Change-Id: I02784a7f2d23bf37d56294e55cb9ec759d1f9080
Former-commit-id: 0551b91b995c893fddee52cabdfbdccf83121a31
2014-09-11 11:52:23 -05:00
Stephen Gilbert
662436c2d5
Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
...
Conflicts:
cave/build/cave/customTargets.xml
edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties
Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6
Former-commit-id: 3775b0762b9d8529f5aa6630480d82e7ea62c1d8
2014-09-11 11:14:33 -04:00
Matthew Howard
7121e2e6e1
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
...
Former-commit-id: 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7
2014-09-11 08:56:49 -05:00
Max Schenkelberg
994605c1ce
Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
...
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb
Former-commit-id: 154c4ac7131ae8f533d4080055d9afe257bf0506
2014-09-10 15:43:19 -05:00
Ben Steffensmeier
ed7b816989
Issue #3604 Fix NPE in Imaging Dialog.
...
Former-commit-id: e2043fd8034dde47963a32108b1475ee7db1ea18
2014-09-10 14:43:23 -05:00
David Friedman
bed361fe35
ASM #16730 - WarnGen Watch wording error when issuing product only over Marine Locations
...
Change-Id: I361a1635cf11f3c66801f33c74034028b3e0271d
Former-commit-id: 17d27fca04fb733d74e5bac99bfed3112bd81b6c
2014-09-10 19:28:57 +00:00
Ron Anderson
b91141ef7b
Issue #3592 Fixed several localization issue in GFE
...
Change-Id: I2e65649d490372b5c1738f07c79b5ed15885f8c7
Former-commit-id: a5ef55df33009948fec139e7729dd53ae4251667
2014-09-09 16:10:53 -05:00
Nate Jensen
62b84b2fb3
Omaha #3356 updates for improved level lookup
...
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362
Former-commit-id: 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b
2014-09-09 15:38:53 -05:00
Brian.Dyke
01dfe503f5
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
2014-09-09 11:44:30 -04:00
Ben Steffensmeier
df96ea543a
Issue #2875 Add current vectors to field display types.
...
Former-commit-id: fbda83fc24a69b6ea8ef335874ecc4146dc392da
2014-09-09 10:35:29 -05:00
Nate Jensen
7920053e2f
Merge "Omaha #3356 more removal of unnecessary register buddies" into omaha_14.4.1
...
Former-commit-id: 90e8451dd089de67278368ca665da0cfc5bb6740
2014-09-09 09:23:28 -05:00
Brian Clements
21ded3ea69
Omaha #3570 http client API changes
...
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f
Former-commit-id: d4edd51d41a306010a7fec2a7ed2c0cd6186506a
2014-09-09 08:47:32 -05:00
Qinglu.Lin
3f666817e0
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
...
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09
Former-commit-id: 7a75687b76584b4578fad4c31c8557d78e507f46
2014-09-09 08:07:46 -04:00
Nate Jensen
b46f23d01b
Omaha #3356 more removal of unnecessary register buddies
...
Change-Id: Ic91c2d5ab93bb220a69be23c54640edae26302a3
Former-commit-id: 39bfb8fd0548c74ed9a4e95b914e90ab2f6ad526
2014-09-08 17:18:22 -05:00
Brian.Dyke
af477df90e
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: 7b49ea6d9c45c0624017bbe7ffb1297a402ee875
2014-09-08 14:54:16 -04:00
Chip Gobs
ec3ff24577
Merge "VLab Issue #4612 Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when performing quality code operations in MPE in GroupEdit Mode." into ohd_14.3.1
...
Former-commit-id: 3ad2b50520a7a8fdfaa1a99a1f34570e43d0164e
2014-09-08 14:29:28 -04:00
Chip Gobs
cf0816edce
Merge "VLab Issue #4602 Fixes MPE Gage Table Data Reading problem introduced in a earlier 14.3.1 build, a.k.a Redmine O&M DR 16699" into ohd_14.3.1
...
Former-commit-id: 57614e9869d5a36c80b8d988e8fea4136045a982
2014-09-08 14:28:33 -04:00
Chip Gobs
874db74c54
VLab Issue #4612
...
Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when
performing quality code operations in MPE in GroupEdit Mode.
Change-Id: Ib8da13cfa2085aeb6efba96e7a1789912534bddd
Former-commit-id: 7df28e4d5c1d8a03db5500939b0af2905d11a4aa
2014-09-08 12:37:20 -04:00
Chip Gobs
25e4ed8d51
VLab Issue #4611
...
Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved,
instead of after the ColorScaleManager is closed.
Change-Id: I0156612302853141392c263eab8b54a16c3be7a3
Former-commit-id: 44f6bf08a72b5450d6d0db40ff49dd5123cf811c
2014-09-08 12:06:45 -04:00
Chip Gobs
4911ac1917
VLab Issue #4602
...
Fixes MPE Gage Table Data Reading problem introduced in a earlier 14.3.1 build, a.k.a Redmine O&M DR 16699
Change-Id: I12b879fb873f66d43d7f735165fa4f303c026174
Former-commit-id: 4d87ebeef93e561a303566853fd2616316c568ca
2014-09-08 11:44:48 -04:00
Baoyu Yin
7008216976
VLab Issue #4623 - AWIPS2_DR_17363 LAPS freezing level height not computed prevents display of hail product; fixes #4623
...
Change-Id: I3b608e9024dbe70e08a549b5469c2fb09e448a9a
Former-commit-id: 61838d538f73adb6279ba55d5fe3c5b02d3a28f4
2014-09-05 11:18:54 -04:00
Chris Cody
9e823a47d6
Omaha #3365 Removing and realigning AWIPS2 Baseline tests
...
Change-Id: Iba40d0b074df500c52b7302ab59a688680153f48
Former-commit-id: 97000cc70e8d826b3e8828a1731278673e0ac635
2014-09-05 10:14:14 -05:00
Brian.Dyke
702dd65aa7
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 876c6fc4db3901fdcd8dd9a6fb343d2f65254569
2014-09-05 11:13:12 -04:00
Baoyu Yin
ebe548d860
VLab Issue #4613 - AWIPS2_DR_14755 Thin Client synchronize misspelled ; fixes #4613
...
Change-Id: I5cf6380bd73f500298d6b1644238abc4d51efdef
Former-commit-id: b5ec42cbbc7c064098075e347b90e4f22045f66d
2014-09-05 10:37:27 -04:00
