Ana Rivera
15b766c9f5
VLab Issue #3943 , #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
...
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 11073fdece9ada9356c511073fdece9ada9356c54c585af9334c585af933706336e633b5e617265280a0799f46
2014-08-15 11:04:23 -05:00
Stephen Gilbert
8f046bbe63
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
...
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Former-commit-id: 84c3e1ed26f6225b896984c3e1ed26f6225b896977fa357a1577fa357a15b20d517e3f333f24b12f33743421ee
2014-08-15 11:03:48 -05:00
Fay.Liang
83fd6095fd
ASM #600 - the fixes for DR 17380
...
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: c2dd7c183ff5901b8edec2dd7c183ff5901b8ede77a6ab632f77a6ab632f6565ac45838fb443033e2520dede55
2014-08-15 11:03:15 -05:00
Ana Rivera
0ff1ac5357
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
...
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 1daa44291ea44d5d91db1daa44291ea44d5d91db9bf2df23be9bf2df23bec294608c37eefe73ee514b42e52ce3
2014-08-15 11:02:36 -05:00
David Friedman
eca651949b
ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature
...
Change-Id: I1bf62b197f65073dc26356e9eb67d32f7f8ee45c
Former-commit-id: 5604904fc8913330902d5604904fc8913330902d62f152ad7062f152ad7095d472a5ce85eae0a58c282892e71d
2014-08-15 11:01:42 -05:00
Qinglu.Lin
a596908646
ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch
...
Change-Id: I5ef8e83c826d3fb1d5ef72d5866f882d9c97e1f5
Former-commit-id: 8693097b0b9a9e32dc538693097b0b9a9e32dc53ff551ea143ff551ea143d7cd89c6e1c1d6719956638aeb810e
2014-08-15 11:01:30 -05:00
Ana Rivera
b626588fae
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
...
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml
Former-commit-id: cc354742e1a053fd5badcc354742e1a053fd5bad95451b295995451b2959dab9e1379a236a089297c8556a8a43
2014-08-15 11:01:23 -05:00
Loubna.Bousaidi
d63ec2ac1c
ASM #578 apply gross range check to the adjusted value
...
Change-Id: Ia90bc10e6e1e1baa8f3842ade56d7551ca405e34
Conflicts:
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Former-commit-id: 8038fc4a8de109528caf8038fc4a8de109528caf213773cde4213773cde45c83a666333c130d00077984a45084
2014-08-15 10:53:47 -05:00
Steve Harris
106e45a937
Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity."
...
This reverts commit 5a3f760b6f51d0561dd605388e6b025ebe70e330 [formerly 7ae3ca0bfc50e93daab7978349e51750e93daab7978349e5177ae3ca0bfc55a1120bdbdd9d117f9055a1120bdbdd9d117f90e5af41fa86e5af41fa868c5cbf72240739666ae99ce3fc1803
2014-08-12 10:19:12 -05:00
Slav Korolev
3687b20fe7
Issue #2875 - Implemented HFR Surface Current Velocity.
...
Former-commit-id: 50e93daab7978349e51750e93daab7978349e5177ae3ca0bfc7ae3ca0bfc4ef0572c2d14cf56ec46a3e480a756
2014-08-12 09:19:22 -04:00
Brian Clements
564da8e578
Issue #3507 fixed sfcobs spring after pullback
...
Change-Id: Ib29f45bf6e61269380f06cdaff7435a03ebf919d
Former-commit-id: 0d3685a3a7a75cbabc5e0d3685a3a7a75cbabc5e07509434b407509434b4db73f6e8654d16c80203dd9cd98f3e
2014-08-08 10:48:40 -05:00
Richard Peter
fe9d5419e1
Issue #3507 Add uf.common.numeric project definition
...
Former-commit-id: 833930de5d94e723f808833930de5d94e723f808acfc8cfb34acfc8cfb345e802442857f13406eafec5553947b
2014-08-07 18:14:19 -05:00
Brian Clements
003d82ed30
Omaha #3229 added bufr buoy support
...
small bufr obs refactor
fixed empty array issue in bufr parser
Change-Id: Ie21ffdafed8b137264db4751c147ce1dd13eabd2
(cherry picked from commit 6f7e22dc52c2f4edc6616d46fabe4b6071e54d61 [formerly 5be93b40842e0408ca1099e86f95be2e0408ca1099e86f95be5be93b408439a7477ffb4a2216079b39a7477ffb4a2216079b7fcf292c8f7fcf292c8f64aed159b5e913dd9772919a732f7b
2014-08-05 08:49:36 -05:00
Roger Ferrel
6928b2a90b
Omaha #3137 - Add checks to prevent NullPointerException.
...
(cherry picked from commit 936f0278683f54bbb27127d40d0b9fb6e195bbb7 [formerly b235e56e28d901d99bde3331d58e1cd901d99bde3331d58e1cb235e56e28d6cae492e843117cf31bd6cae492e843117cf31b01b30e76c401b30e76c4d48ae916fa128b060e9f1905640a3a
2014-08-05 08:49:12 -05:00
Roger Ferrel
9f0f3e4a0c
Issue #3181 Add check for valid array index.
...
Change-Id: I8e0a37bdd094b341da2ce42922a16d840d1ab468
(cherry picked from commit b4e8d1cdfdb0ef718e97fd7ca615b086b30aa6c0 [formerly adf6d95c01fb4ac9acc7a1f25b8748fb4ac9acc7a1f25b8748adf6d95c01332dd7a557359b835955332dd7a557359b83595554bdfef65a54bdfef65a0e1d2d002e102615aea1ac3eaf3c7d
2014-08-05 08:47:56 -05:00
Roger Ferrel
8df17b24b0
Issue #2881 configuration changes.
...
(cherry picked from commit f95000685b2ac45dc375132aaf8bbd8635fe7f18 [formerly 365c886263422504f8b8e6b3733fc5422504f8b8e6b3733fc5365c886263996a5aa900f9bc73fe2b996a5aa900f9bc73fe2bdd6d7878dcdd6d7878dc29e9ad3dbf82ec47c4a33521636c64
2014-08-05 08:47:45 -05:00
Roger Ferrel
0b0e81efa2
Issue #3036 Added check for archive's root directories.
...
(cherry picked from commit 05ef116e9f4cc2afa497a6cca92167bfd74f516b [formerly 3259d4d44d039e4b52097a2775ecbc039e4b52097a2775ecbc3259d4d44dcdd5b40b46eb34a25362cdd5b40b46eb34a25362b56faa544bb56faa544beaa2d0c3797a00bc1a2e17c1bd9b49
2014-08-05 08:47:24 -05:00
Brian Clements
3628b2f988
Issue #2906 added close to BUFR parser
...
close netcdf file to solve NFS clean issue
(cherry picked from commit 9434b5c653b3a542cc56eac1081f0ab7126966a2 [formerly a1e416da97abb14c67e75beb3be2e8abb14c67e75beb3be2e8a1e416da97d83882a92cbb17c8cfc1d83882a92cbb17c8cfc180a0bba04e80a0bba04ed2d38805cf5e72d873aa2570d4c11d
2014-08-05 08:46:31 -05:00
Brian Clements
721e10e593
Issue #2906 removed wmo header, timeObs and timeNominal from sfcobs HDF5
...
times still in DB, accesible from point data view
BUFR obs decoder populates WMO header for consistency
(cherry picked from commit 42555bd3af906773415f4cf7c4f5e2d1f8b01d2d [formerly 61832eac8662e57a4d824e976fafed62e57a4d824e976fafed61832eac86d2edc53a162b4bdeb10bd2edc53a162b4bdeb10bccc86dba74ccc86dba74b7b533d5b48fee1621dbbd6fa8a3f3
2014-08-05 08:44:10 -05:00
Roger Ferrel
f01442daee
Issue #3045 Code cleanup for CategoryConfig and ArchiveConfig,
...
(cherry picked from commit 0da3dcc1f33c137bf80ce3513e5e7dad035d9578 [formerly e07f655d1d8a1c15d7dc1f6c21885d8a1c15d7dc1f6c21885de07f655d1da6832911d22c1d1cb953a6832911d22c1d1cb95329c07ce4c929c07ce4c9f94198b3d190c39277ed5c40e3dd5a
2014-08-05 08:43:58 -05:00
Brian Clements
b596badfcc
Issue #2906 added wx_past to bufr decoder
...
added aliases and bufr table mappings
(cherry picked from commit da3e31a41a2509a38925085658c8c814fded2242 [formerly 7c80552f73acc185a952da8e9f6442acc185a952da8e9f64427c80552f735d0e567d62c855e4fe7f5d0e567d62c855e4fe7fcfd08485eacfd08485eaf5c924c141c15aaab136deb7e0e842
2014-08-05 08:43:45 -05:00
Roger Ferrel
97579e24da
Issue #3023 Configurable available disk thresholds and unit test fixes
...
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0
(cherry picked from commit 034fd9ddf208942f5ef84e2c4383a0512874e8b9 [formerly 3af564a653dc25ece75f8ce590c31cdc25ece75f8ce590c31c3af564a653a394ec6b598171a30330a394ec6b598171a303300a09094ac00a09094ac0971a29b8c1cb1b8bba847dfeadf032
2014-08-05 08:43:23 -05:00
Roger Ferrel
04360e9889
Issue #2862 Implements locks on case creation.
...
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
(cherry picked from commit 41c889ce01087a1848a114aa936c54e0767e65ad [formerly cfea0489d716fab01b8b5570261d7416fab01b8b5570261d74cfea0489d7f079a85cf20e2dca458cf079a85cf20e2dca458ca0e8aa94d8a0e8aa94d822882769767185b58ef336a1b87087
2014-08-05 08:39:07 -05:00
Brian Clements
7146154d59
Issue #2906 removed accidental manifest entry for bufr obs
...
(cherry picked from commit 26eaaa7a871860fc6b71d39c776a72a217c83445 [formerly e8708eb44dc4bbcc0688f2d2cab0fcc4bbcc0688f2d2cab0fce8708eb44dde9e082c6b20db80ee18de9e082c6b20db80ee186d8da045376d8da04537ee62b8086afa598b44d442d6e29bd3
2014-08-05 08:33:30 -05:00
Brian Clements
47a914c158
Issue #2906 added synop bufr obs decoder
...
fixed units in sfcobs point data description
made getDescription() and static constants public in point data transform
fixed typo in udunits alias file
created new decoder for synop bufr obs
added decoder and dependencies to features
(cherry picked from commit 591d37ffc9ae703027d6c70fd87067d5690b2f01 [formerly 972d18cd3b1e2ad93e65663337e6611e2ad93e65663337e661972d18cd3b569633c8881701fdb4bc569633c8881701fdb4bcd352bd0755d352bd075570085a10065a7b6c9cbbfcef6b95b8
2014-08-05 08:32:34 -05:00
Roger Ferrel
b0b1cb799a
Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks.
...
Change-Id: I067b6037d5b044229f2c1e5acdd7ec5f7a372908
(cherry picked from commit c5bcf0ac19359b841b6fc7c757d73f5e3183377e [formerly c86d738d5b032ee7ef77226b1be015032ee7ef77226b1be015c86d738d5b51cac995134e779917d551cac995134e779917d530e00a443b30e00a443b8ca69ce5dab7f70f8f50cc6d27d307
2014-08-05 08:30:50 -05:00
Brian Clements
dc5df1a882
Issue #2905 removed java 1.7 specific code
...
use of Integer.compare()
(cherry picked from commit 3447a6bd270c1fb1f8b8e2f6359ee911467576d5 [formerly f53203712fae3ece84bea1d9d323bdae3ece84bea1d9d323bdf53203712f627c6d74d5879aa1a714627c6d74d5879aa1a714c00624203ec00624203e8c29fdff21314112259ef2c46d45e5
2014-08-05 08:29:28 -05:00
Brian Clements
e67eafa75a
Issue #2906 fixed mapper no-value checks to do both null and empty set
...
fixed problem caused by previous change
(cherry picked from commit 2111d03bfb4f211e730cad4bab3c0d90d1acea94 [formerly fe281381ab1a45c232019e6da341501a45c232019e6da34150fe281381ab15273287c1b6e5d4a5fb15273287c1b6e5d4a5fb0d409b86750d409b8675a6f10fb4a75382df2f2668aa77eae3
2014-08-05 08:29:14 -05:00
Brian Clements
10cf647831
Issue #2905 added BUFR parsing utilities
...
added table units parser for BUFR table values
added time units parser for BUFR time values
added lookup methods to translation table
added mapping class for BUFR fields to point data container parameters
(cherry picked from commit fba087b0deceacba66aa5ea192af8795d6c40abc [formerly dacfc4082d43512fd90aed7a808b8743512fd90aed7a808b87dacfc4082d6f55baa9c42874a5b9166f55baa9c42874a5b916c4623a6dd2c4623a6dd2e420f5aa506d444d03ef72ecde61d0
2014-08-05 08:28:59 -05:00
Brian Clements
6edc6a70be
Issue #2905 moved bufr splitter to separate utility
...
BUFR parser now only processes one file at a time
added method to scan for field in structure
(cherry picked from commit 8ad42c15ecc7299a05cca9a9d19e872b0da08904 [formerly ec6f8bb961429056b078c330bbb7e4429056b078c330bbb7e4ec6f8bb9613f2d7e4b0f91c211cc4b3f2d7e4b0f91c211cc4b13fb37e99313fb37e993b18ee87444ef2df27b8eb2d86b5d62
2014-08-05 08:28:44 -05:00
Brian Clements
adee53ce3d
Issue #2906 fixed not checking for empty set in Mapper
...
(cherry picked from commit fdcd896f8cdc53c4324a60202b51780b0c054adc [formerly 6d7e47bfc5cf1d6c834c054eab2b3ccf1d6c834c054eab2b3c6d7e47bfc57dbd9922b55045ecbd907dbd9922b55045ecbd9096dfa3447d96dfa3447d46034d331e63f972d8547cc867ee72
2014-08-05 08:28:31 -05:00
Brian Clements
db0ca58280
Issue #2906 added UnitMapper to convert between udunits and UCUM
...
(cherry picked from commit 4649b903fdaec93a047ac16578363b7340559b00 [formerly 9ed58058fa6d8b4cd70e9a5c4142bb6d8b4cd70e9a5c4142bb9ed58058fab2666b3fa62a5a946d64b2666b3fa62a5a946d64ae670e22f4ae670e22f47e8f7c86c33e11a6db7133fc30a7fe
2014-08-05 08:28:12 -05:00
Brian Clements
0f89cb0efb
Issue #2906 change util.mapping to return empty sets instead of null
...
(cherry picked from commit aace51a21c5fb75729b1789a5ff50d48e13f7baf [formerly 29ace2a204c150d74ce72d6be840c8c150d74ce72d6be840c829ace2a204429aa61e23139cf1684d429aa61e23139cf1684d99831a3a6199831a3a6120cebfb62867f062c3d0c6c0e2142c
2014-08-05 08:27:59 -05:00
Brian Clements
f553c56a2d
Issue #2906 added synoptic obs translation tables
...
created a command line utility to generate translation table starters
added synoptic table mapped values to bufr translation tables
(cherry picked from commit 46e90be742b97d6b8c56ec7186d0321c8e60e4a0 [formerly 0fa7dfb7df467cfe59d0f4361b78b6467cfe59d0f4361b78b60fa7dfb7df60d00d4e351831aa8e6360d00d4e351831aa8e63dc8e25800adc8e25800ab3c23853aae16399bc39da55194679
2014-08-05 08:27:43 -05:00
Roger Ferrel
8b7e403716
Issue #2790 Detect problems caused by simultaneous running of purge.
...
(cherry picked from commit 0906db81aa8b6a816613d1bb9c12537ecd15d8a9 [formerly f012ac179dae2cb792a1ad5d6428a6ae2cb792a1ad5d6428a6f012ac179d6bf935369f679eb13d866bf935369f679eb13d86e731ba7e8be731ba7e8bf32f0ec21e52860b56ebabc10e2d9f
2014-08-05 08:24:24 -05:00
Brian Clements
a75de113c1
Issue #2905 fixed types, added scale/offset in bufr parser
...
parser now does the following for each data value:
1) promote unsigned values to next larger type
2) replace with null if value equals missing value
3) apply scale factor and addition offset
to do this, the netcdf variable for each structure member was needed
this required walking the variable list along with the struct iterator
(cherry picked from commit d5127be4abcf856c47fd33f94938a43d49d54bf9 [formerly 3e5a5774c452a7443a6c82cee1573952a7443a6c82cee157393e5a5774c4a23be62a376ea5ca108ea23be62a376ea5ca108eda184db6fbda184db6fb030c01a9265dc56078febfaf1cff2b
2014-08-05 08:22:46 -05:00
Brian Clements
a9ef8554b0
Issue #2905 added translation tables for BUFR
...
added current WMO BUFR code/flag XML table file
created parser that can read the WMO XML
created JAXB files for BUFR translation XML files
created utility to generate translation tables for specific BUFR tables
(cherry picked from commit 4445c9fb6fa302cecfab679929a2eb9635ee60dd [formerly d9eb75280df4ac2d117e6d3d459a90f4ac2d117e6d3d459a90d9eb75280d67783ef546a500d4192c67783ef546a500d4192cf2def807b9f2def807b9fa67732716315e909b857bc59abc12
2014-08-05 08:22:25 -05:00
Brian Clements
6df4566e9e
Issue #2905 added ucar bufr parser
...
added netcdf 4.2 bufr library to ucar.nc2 foss
added backported 4.3 bufr splitter library
created a parser wrapper for ease of use
(cherry picked from commit cf5ce74ac8d2ee60d7a98eda2236779300557bbc [formerly 5348f0a29d5b69e9b21c199701def95b69e9b21c199701def95348f0a29d58935ffa45e8b2235bb258935ffa45e8b2235bb28db12508fa8db12508fa88a0949afb3368a39acae86828c9f2
2014-08-05 08:22:08 -05:00
Roger Ferrel
d7a10e1bf7
Issue #2838 Archive binary feeder creation.
...
Change-Id: I4e431d62e3d27565af75d52012fe042a18fd1f9c
(cherry picked from commit a8978d827f73f7256e6a80ecaf581eb65d4459c2 [formerly 995d962a66ac036758809b7715e5e0ac036758809b7715e5e0995d962a6642eb06622a030c4955a642eb06622a030c4955a6c66a0a1015c66a0a10157e6c6c495d631e52cf164660aa5845
2014-08-05 08:21:42 -05:00
Brian.Dyke
29bc56c37f
Merge branch 'asm_14.2.2' into master_14.2.2
...
Former-commit-id: eeca2f2ec83598f7b549eeca2f2ec83598f7b549905728d2fb905728d2fb370b180653e3745633a3f5030dfeb5
2014-07-31 09:56:21 -04:00
Shawn.Hooper
53daf4e3bc
ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
...
This reverts commit 9732ea69398c323fee2b61570bfc18ab595da709 [formerly 8cffe955a9e24dd6958eba4c386f30e24dd6958eba4c386f308cffe955a927f50397aa976c7b2d4a27f50397aa976c7b2d4a4e322737ce4e322737ceaf19d9f9c4fe0fffe51b17ac974932
2014-07-30 14:03:51 -04:00
Kiran.Shrestha
fa984fd8a4
ASM #97 - Freezing Level Height AGL for all models has units of dam instead of feet
...
Change-Id: Ib92fbb1c153a8a4739371d8148673a5e32ea36f9
Former-commit-id: e9a417f5f8a044b44c8be9a417f5f8a044b44c8b11bab4078511bab40785fe32fc419ad32c2739cf2c2ad03ee5
2014-07-28 16:18:39 -04:00
Michael Gamazaychikov
cc3172ead3
ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
...
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1
Former-commit-id: e24dd6958eba4c386f30e24dd6958eba4c386f308cffe955a98cffe955a9f186b49e92bb7b43be49134b1286fc
2014-07-28 15:12:10 -04:00
Rici.Yu
53691c3cd3
ASM #15655 - Negate raising exception for empty db from IFPDB()
...
Change-Id: I5c96d654f3080a4b0f10113648f290a0d09961cb
Former-commit-id: a75c0c2f159a1310d1aca75c0c2f159a1310d1ac661737fb39661737fb39bacd423e0e60116edbccaf5d129375
2014-07-28 11:30:49 -04:00
Brian.Dyke
3b1020701c
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: cd099c0902cef9771fe1cd099c0902cef9771fe13d6c40b3413d6c40b3413f9cbad0895eebb40e76a6ac0d4696
2014-07-24 09:03:57 -04:00
Jonathan Sanchez
e4268f814e
Issue #3419 Refactored watches to use the county table.
...
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: 997485dd2286a8ca4a30997485dd2286a8ca4a30b991838494b991838494f7bc9a8023025c29acc056cbd23141
2014-07-22 15:32:12 -05:00
Shawn.Hooper
df3b41ed7d
ASM #15630 - Check-in fix for GFE: Missing ISC Wind Grids on behalf of Ron Anderson
...
Change-Id: I9053182b6c02d6c77e10e23b017b94bcff4da58b
Former-commit-id: a70786ff222a32d5945ca70786ff222a32d5945cae272328a3ae272328a34171066d8494e01820a2141996f0ab
2014-07-22 15:59:22 -04:00
Steve Harris
3b5fc91579
Merge branch 'master_14.2.2' into omaha_14.2.2
...
Former-commit-id: 7b0b043c67bce70395087b0b043c67bce70395088a7ea92c2b8a7ea92c2b7a4111b29f0314663e95e24b5a2fec
2014-07-22 10:26:33 -05:00
Shawn Hooper
41da5c063e
Merge "Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"" into asm_14.2.2
...
Former-commit-id: be7b6c166f1a57a9adeabe7b6c166f1a57a9adea1e2324481b1e2324481bbe27a13d1de26c9dd7d101c315ff5d
2014-07-22 10:19:27 -05:00
Shawn Hooper
17d864604d
Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"
...
This reverts commit a31a408a18846806e64c2450d665b6ce6ed8ea82 [formerly 8de6be5219212fcd9eb4a5791db7cb212fcd9eb4a5791db7cb8de6be5219faf934a05a425bcea65dfaf934a05a425bcea65d65802e34fd65802e34fde44a911ccce53566cda244cfa3d6d3
2014-07-22 10:15:46 -05:00
