Steve Harris
8c95084547
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: ff0808a91ab8b08878954b0fa32c00c20b3e5ef3
2016-02-10 13:31:20 -06:00
Ron Anderson
620774fb77
Omaha #5316 Refactor GHGMonitor to use AbstractZoneSelector and remove viz.gfe dependencies
...
Change-Id: I6b549acb02609bb8634d277ca70f98cc7f46db1b
Former-commit-id: d48fb3f2a9e99baa6f58a86cc5546f71da3add41
2016-02-09 10:29:00 -06:00
Ana Rivera
7e9fd3ba8c
VLab Issue #15494 - DR18600 GFE:Remove unnecessary references in Run_NWPS.py procedure; fixes #15494
...
Change-Id: I4238c3e43e185402640890c462eebad6647ec45b
Former-commit-id: 24eedfe35831a5d4c6a29d3aa4b98246abccf6af
2016-02-05 20:38:57 +00:00
Steve Harris
85055fcc53
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8
2016-02-01 11:57:52 -06:00
Ron Anderson
ada45e18ac
Omaha #5054 Fix dialog parenting
...
Change-Id: I3822c77d2408a9bfe7205eb088fe3e83240c38b2
Former-commit-id: 0d9e2750c9da9359ab57b6c792af1535347ecb0c
2016-01-29 10:45:28 -06:00
Steve Harris
dcaaf9f52b
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 13a968811d1cdde95f663d7af4b8a6030ece556e
2016-01-28 15:47:31 -06:00
Steve Harris
2b750a291a
Merge tag 'OB_16.2.1-8' into omaha_16.2.1
...
16.2.1-8
Former-commit-id: b22a2cd9f647e0cffe3bd013138b6617e34379ac
2016-01-28 15:32:25 -06:00
David Gillingham
e53d6e41c8
Omaha #5129 : Fix SmartScript.py bugs caused by changes to IFPClient.
...
Change-Id: I14cea9c8c63fc23921d015ddbea15eb4df6abb1c
Former-commit-id: 3250e376f70089a8d54c021a20c06fab6a3bac75
2016-01-28 14:53:51 -06:00
David Gillingham
e997116f9a
Omaha #5295 : Fix GFE pencil tool when working in ISC mode with grids with different time constraints than Fcst database.
...
Change-Id: Ieed3aced24abb9af15f25b055f25e4f65c67f229
Former-commit-id: 82219b236447c9bde7b2f1cfb306eb9595ab5b51
2016-01-28 13:58:27 -06:00
Shawn.Hooper
65ed37fe67
Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
...
Former-commit-id: f9d6debd8f835e8fd9f80fab2a70460ad06303c8
2016-01-27 17:14:01 -05:00
Shawn.Hooper
12fc325051
Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
...
Former-commit-id: 38a3f56c751b61b312e3f031d00f07cc9b9d420d
2016-01-27 17:13:38 -05:00
Bruce.Hundermark
3e9df01b7a
ASM #18562 - ISC_Discrepancies not working for time range between current time and zulu
...
Change-Id: I0b25fb0600a3605c4cddab60174ca75e9d3f724c
Former-commit-id: 2d031529e12189b451582b8cd4797c8e91e09772
2016-01-27 18:35:20 +00:00
Yun.Teng
39f2bc919d
ASM #14453 - Make color for same weather type consistent in different grids
...
Change-Id: Ib8f58c39e903d208718ed505a9fe3ac6b6f9be7d
Former-commit-id: 3dbd14e31b4d25bc9806f2fc71e3144550f5de91
2016-01-27 16:02:33 +00:00
Shawn.Hooper
9efc850e4a
Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
...
Former-commit-id: fe5781c930e4cab0ece462f9ae6152b1d4f4633c
2016-01-26 17:16:15 -05:00
Sarah Pontius
da545043c9
VLab Issue #15111 - TCV and HLS Revisions; fixes #15111
...
Change-Id: I013d6f23d30fb7471923fe1ad3883f4329b77cbf
Former-commit-id: fc7322a5615887e12ddd5364ed593b7d3595b967
2016-01-26 11:40:15 -07:00
Shawn.Hooper
2861d7abd7
Merge tag 'OB_16.1.2-14' into master_16.2.1
...
16.1.2-14
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: If4483610b92d4c2ef975c3ac75403e12a70d612c
Former-commit-id: 66d3cd35731e59996c34f003e42cbb2a41010717
2016-01-25 14:32:31 -05:00
Ying-Lian.Shi
ba9a1d66a5
ASM #18505 GFE: Resent product should have same WMO, MND, and segment times as original product.
...
Change-Id: I8fa675e63f05e16547fdc8ed108790bcbccb0bf7
Former-commit-id: 851ff43a2ba628cc4d239e15784e52ea7d1f1ab1
2016-01-21 19:28:55 +00:00
Ron Anderson
3d867790f3
Omaha #4751 Fix type of mask returned from getComposite()
...
Change-Id: I0c136042a0ea43bb2cf7b9462eb9fea257b19ab9
Former-commit-id: 23bed260bc1e1302070f49dadc3a978e218ee513
2016-01-20 18:22:39 -06:00
Steve Harris
e4202dd626
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 6e31f1b2e4f7c30faf67d0d62b5907b111e4b52f
2016-01-20 16:49:18 -06:00
Shawn.Hooper
3f05c3da44
Merge remote-tracking branch 'vlab/field_16.2.1' into master_16.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I279d046dc8a054563c9ddabd92350f8d97222355
Former-commit-id: f9ff90f121eff9ae632b8bcc47c3500d9f647d00
2016-01-20 16:49:53 -05:00
Steve Harris
11a5db155d
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java
Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
2016-01-20 15:23:43 -06:00
Steve Harris
52279f6cc1
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertMessageDlg.java
cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GFEConfigDialog.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
Former-commit-id: afd3fb15b22d92b6b30205446b6fe4b3e21271bf
2016-01-20 09:44:34 -06:00
Nate Jensen
14a9e61d44
Merge "Omaha #4834 fix creating new python files in localization perspective" into omaha_16.2.2
...
Former-commit-id: a762710e651937513a51b0f61ffb82d0d8c5dac7
2016-01-19 16:54:10 -06:00
Nate Jensen
fa342b26c6
Omaha #4834 fix creating new python files in localization perspective
...
Change-Id: I1de950c906674a7235369a1144ffae0d5bfefe03
Former-commit-id: da7c223cb78db37b68faa99f3fb4e01c6cb01cc1
2016-01-19 14:53:56 -06:00
Ron Anderson
24bc0a3344
Omaha #5054 Fix Dialog parenting
...
Change-Id: Ie7e1727ef9666cf510093f8fb6b06a1a258a30e2
Former-commit-id: 5093e43e9d1d26898f9719e00f6489a7f3ea55c8
2016-01-19 09:19:13 -06:00
Ron Anderson
805ae46121
Omaha #5239 Fix sizing issues with Make Hazards Dialog
...
Change-Id: I9898d19ade98916ca925ed94536c059870043fbe
Former-commit-id: beb26659a59d0f14f11bad609ea34f6b4ad2357d
2016-01-15 11:53:15 -06:00
Ana Rivera
35b00be61e
Merge branch 'master_16.2.1' into field_16.2.1
...
Change-Id: I197477fc4ceeb0efbd47335a98df7a2bedb703e0
Former-commit-id: 521d1a43251c5c8a697eccd7d09965dee58fd50b
2016-01-15 16:09:14 +00:00
Ron Anderson
9f255c8d50
Omaha #5070 Adjust font sizes for dpi scaling
...
(cherry picked from commit 0fac683b60
2016-01-13 19:17:37 -06:00
Ron Anderson
4279c9f227
Omaha #5054 Fix location of GfeConfigDialog in multimonitor display.
...
(cherry picked from commit a19811a730#5054 Fix Text workstation window locations on multimonitor display
(cherry picked from commit 5085377b9d#5054 Fixed resizing of AlertViz bar on multimonitor displayes. Code cleanup.
(cherry picked from commit d6f0f5535e
2016-01-13 18:54:49 -06:00
Ana Rivera
ce676e7137
VLab Issue #14839 - DR18499 HTI Improvements:TCFloodingRainThreat; fixes #14839
...
Modify script to avoid duplication in modelList. (Ref: DCS16913)
Change-Id: I2f0d5eaafee7b391b3e6af58e01f4ec51f4d13cd
Former-commit-id: 6ee88ef090e525fd1552d0c3a48f09c6a6722623
2016-01-13 16:16:44 +00:00
Shawn.Hooper
bd27f40c6d
Merge tag 'OB_16.1.2-9' into master_16.2.1
...
16.1.2-9
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c
Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
David Gillingham
98add87c02
Omaha #4816 : Prevent smart tools from terminating edit area query thread pool.
...
Change-Id: Iefa637f6386aa9c7d71b9d844bf29e7d0558e2cb
Former-commit-id: e8b882968f2f8f7b640c19883e9b0b2299e90d2f
2016-01-08 11:34:32 -06:00
David Gillingham
7075694a59
Omaha #5129 : Fix exceptions in text formatters caused by changes to WeatherSubKey.py.
...
Change-Id: I9b00fe71c0a6890a4317acd848013d4faaecb902
Former-commit-id: 580c6afb9e8b5e7aeb3118a2944f02f1e1e97f8e
2016-01-08 10:33:02 -06:00
Steve Harris
8a07970ba6
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
2016-01-06 11:55:00 -06:00
David Gillingham
51c6511b7d
Omaha #5184 : Make GHG Monitor mostly independent of GFE. viz.gfe has not been removed because ZoneSelector needs to be refactored out still.
...
Change-Id: I9826da4c73982ab5b0c1a78f5c4dc68060787c5c
Former-commit-id: 52a9798259aaeb3c0f5b9b6826ad23991d3dd191
2016-01-05 12:17:52 -06:00
Ana Rivera
c2f8228c2d
Merge branch 'master_16.2.1'(OB_16.2.1-4) into field_16.2.1
...
Change-Id: I617467c415770772d536ebf63fbee37d05dda274
Former-commit-id: 0404e732800c94130a76226e3b0c8947f09b6bac
2016-01-05 14:40:05 +00:00
Steve Harris
77e9dd0e31
Merge tag 'OB_16.2.1-4' into omaha_16.2.1
...
16.2.1-4
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
Former-commit-id: 8cf6955bc2f007b352bea3b2ffea1927f549caec
2016-01-04 19:43:07 -06:00
Shawn.Hooper
dc86635bb9
Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
Former-commit-id: 071dbbc21ea440c1c4cb5bbd739ddcba861cdefd
2015-12-31 09:31:25 -05:00
Shawn.Hooper
c7c3d81479
Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
...
Former-commit-id: abfd5978ff55d595eaba09c4a70f763fb56986f9
2015-12-28 09:56:50 -05:00
Shawn.Hooper
b8033af017
Merge tag 'OB_16.1.1-33' into master_16.1.2
...
16.1.1-33
Former-commit-id: 1de8dc49d42d788ce1db425f7206000fdc3e9ca3
2015-12-23 14:30:07 -05:00
Shawn.Hooper
16f7b165ed
Merge remote-tracking branch 'asm/asm_16.1.1' into master_16.1.1
...
Former-commit-id: 84fee2e252b48be4922b51062d92b451c324c79f
2015-12-23 11:48:51 -05:00
Ying-Lian.Shi
13bf65cab5
ASM #18428 GFE: Issuing a Correction of a corrected product via an existing Product Editor in GFE throws an error and unlocks text
...
Change-Id: Ib0aac70c3f5592bee02446b307cecde18ada4cda
Former-commit-id: bc14cb7f4433caae5693ff7775f42bfe70988eac
2015-12-22 17:42:03 +00:00
Shawn.Hooper
c03bf2fc84
Merge tag 'OB_16.1.1-32' into master_16.1.2
...
16.1.1-32
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/EditPrecipStationsDialog.java
Former-commit-id: bbe412da6e8b600bfcab446d46619c57a65efbe8
2015-12-22 10:23:34 -05:00
Ana Rivera
8736560556
VLab Issue #14020 - DR18419 Baseline GridManipulation.py; fixes #14020
...
Required by CopyNHCProposed.py. Code provided by Matt Belk.
Change-Id: Ibca897836b703c6af24c9e48ee8948edc2a9e77a
Former-commit-id: d47611ec55c292c0276145b2037e1e6153d65d77
2015-12-17 14:40:52 +00:00
Shawn.Hooper
0aa4bff53c
Merge remote-tracking branch 'asm/asm_16.1.1' into master_16.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Former-commit-id: 713eca23ad654688d6e2d83f2311fda973ca0d4c
2015-12-17 08:49:54 -05:00
Yun.Teng
63b7720760
ASM #18367 - Disable finalizing ETN when product is stored to text database
...
Change-Id: Ic04f222bcf6b0a8c6c4fb0265128f37607865f1c
Former-commit-id: ae843c763b2cff45b278e1f653979fce33b77770
2015-12-16 16:44:15 +00:00
David Gillingham
60313a2120
Omaha #4816 : Fix baseline code to support refactored PythonJobCoordinator API.
...
Change-Id: I906946954158e2c5fa39195e8869bca815720aa0
Former-commit-id: c30f24c376f2548126fe08369951bd5a4cf78225
2015-12-16 10:03:31 -06:00
Ying-Lian.Shi
a1d080004e
ASM #18410 For corrected products, both WMO time and MND time should match the current time
...
Change-Id: Ia4f7ff5c125798181ac3860e15174e45eecb3941
Former-commit-id: 50d447eeb936f6ef7f2952d6d9879f38905cb50b
2015-12-16 14:38:23 +00:00
Ana Rivera
cfc3107049
VLab Issue #9806 - DCS16913(set_3) HTI Improvements: CopyNHCProposed.py; fixes #9806
...
Change-Id: I1d5ac66566bb92c7e5aef9d264baab9325fdc264
Former-commit-id: 6834535722d3017b082239e3c72c24a4ead7a565
2015-12-12 18:06:19 +00:00
Steve Harris
18b05381a8
Merge tag 'OB_16.1.1-29' into omaha_16.1.1
...
16.1.1-29
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Former-commit-id: eed5a5a8c0c4cbe5bd551187ea5dac6b449c5b3e
2015-12-11 12:44:10 -06:00
