Brian Clements
e9604a9700
Issue #2756 implemented HTTP public key auth scheme
...
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client
Former-commit-id: fd189632219d0b02e0a4ce24bd1018fd189632219d0b02e0a4ce24bd1018d8e283e1b4ce24bd1018d8e283e1b443c19f09baf56cbac9fbedd72cbde46d4abdc37cf00f8eb1d9
2014-02-28 16:15:17 -06:00
Lee Venable
ba565d1d35
Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
...
Former-commit-id: 4631a29ca340f3df6afff171e3adb04631a29ca340f3df6afff171e3adb0c77634951cf171e3adb0c77634951c639f66e8b267f7d52f74734f69403a7bbedd6edd1ffa59cf4f
2014-02-28 13:50:15 -06:00
Mike Duff
60c471f48e
Issue #2632 - Implement buddy pounce (Contact Notifiers)
...
Review comments
Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7
Former-commit-id: 512e634a97377c1f99985440ff64d1512e634a97377c1f99985440ff64d15f433b4f6b5440ff64d15f433b4f6b6c5c943a5e63fc5f8c66ee06fc58b502fa0d3c596c60255b75
2014-02-28 13:23:34 -06:00
Richard Peter
b8010ec1f1
Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
...
Former-commit-id: 39cf8178ff18ec1e12ae5565bc88af39cf8178ff18ec1e12ae5565bc88afd5e09a82a75565bc88afd5e09a82a7feb0543e0ee4dc3ea6cff5c3e5d549d736455a8a34e2ab0d43
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
19f976b1d3
Issue #2791 Switch contouring to use DataSource for data access.
...
Former-commit-id: 7c8332a30ffbf6371c8e4b7f3b2a5b7c8332a30ffbf6371c8e4b7f3b2a5b23ce77d8644b7f3b2a5b23ce77d864b747a91eaa278ef9f0d4a7787a7ff2c0c017e451118991ec22
2014-02-28 11:28:02 -06:00
Nate Jensen
7d45344d05
Merge "Issue #2703 Fix GFE time matching in iscMode." into development
...
Former-commit-id: 3153786b6fb40f5477b463244f840f3153786b6fb40f5477b463244f840f908d30882563244f840f908d3088257ab7887199fb68c4c07f92527f1ffaf0bb217f044e66e5bcc5
2014-02-28 09:53:27 -06:00
Richard Peter
ef2ff1d0f7
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 79d3aa4e1a7bd6a079130e25ae35c179d3aa4e1a7bd6a079130e25ae35c11c150e6e8b0e25ae35c11c150e6e8b1d6e9816e050a1b270c5f13c86bc3e9b3f8f96495fab51d41b
2014-02-27 15:18:26 -06:00
Richard Peter
7f36cf564b
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 63da19f472c267c5a08f86d42ed60363da19f472c267c5a08f86d42ed603862069dfd386d42ed603862069dfd39f43d8e4b2237ada7b8bc0d495d9c39489565efb68eade49a2
2014-02-27 13:46:47 -06:00
Richard Peter
0f7ab600e6
Issue #2509 : Fix merge of SS #124
...
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: ae39697315a23c8f2c27729d608a15ae39697315a23c8f2c27729d608a15d54fee5dae729d608a15d54fee5dae3b09c69f6567093287a0229437773b9ca22fce7f8d35f1ce5f
2014-02-27 13:20:49 -06:00
Nate Jensen
e00bb786ce
Merge "Issue #2312 Fix file dialog input on export image dialog." into development
...
Former-commit-id: 6e94f1dbbf414cc002b171d494eb346e94f1dbbf414cc002b171d494eb34d1ec11d93271d494eb34d1ec11d932b13f09826280ef0dc0559a39867de4ee788777ad445fd40303
2014-02-27 09:10:07 -06:00
Lee Venable
b9455bcd94
Issue #2795 - added code to check for null images.
...
Former-commit-id: 191ca5f9ca5546b537cf0c7395d423191ca5f9ca5546b537cf0c7395d42349530206f40c7395d42349530206f4da795bce9835f6f35186facc67e6b53932c3f02f54fa6c12b3
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
b4f8468f87
Issue #2711 Use level factory more.
...
Former-commit-id: 3d9b4352621069ef8d67d7a3ae4fdb3d9b4352621069ef8d67d7a3ae4fdb3da086b71fd7a3ae4fdb3da086b71f4d1276def229f9a87085f45646ae913a5f655ea40dd62678f2
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
b830f753bb
Issue #2312 Fix file dialog input on export image dialog.
...
Former-commit-id: ee8f345cb22fd8351874e1dc75f97aee8f345cb22fd8351874e1dc75f97a6d0a78e233e1dc75f97a6d0a78e23388fd930b77058652febe2d11421854542c8ae3a15fd6a533b8
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
0de5a55243
Issue #2703 Fix GFE time matching in iscMode.
...
Former-commit-id: fa6dcaac842425b9665cd8bfdd1a7efa6dcaac842425b9665cd8bfdd1a7e07bc9f075fd8bfdd1a7e07bc9f075f66b052cd5a0fde78c595804cbb48e66843396c78d899433612
2014-02-26 14:45:19 -06:00
Lee Venable
b7ad39dab9
Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
...
Former-commit-id: d74b2c0118bb4b03437594cede8153d74b2c0118bb4b03437594cede8153e0ee93bab394cede8153e0ee93bab3de2bff4d9591d419662ce0fbc02307316ba53e748d49130542
2014-02-26 13:21:58 -06:00
Brian Clements
db0299b3e6
Issue #2751 fixed webDAV path issue
...
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded
Former-commit-id: 9597ce5cd93f0e9d7a77eef242194a9597ce5cd93f0e9d7a77eef242194a3d365a4cd2eef242194a3d365a4cd2408b834fc61f5d296314473fcda0cfa102e927b11001ef1ec2
2014-02-25 09:17:36 -06:00
Nate Jensen
8494f972d7
Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
...
Former-commit-id: 055caba2bf8ef957d2f0279f05a1d5055caba2bf8ef957d2f0279f05a1d5060eafc272279f05a1d5060eafc272308a5606022f58408036a5477ea272d9411eb382caaffabda3
2014-02-24 16:17:20 -06:00
Nate Jensen
012037c1e6
Issue #2830 sort TAF dataTimes so latest are retrieved
...
Former-commit-id: a201d43d63230b8bf1178a00a419a1a201d43d63230b8bf1178a00a419a1f353c44cc08a00a419a1f353c44cc04d460d3a26a97f5b5ff774329bcb8902d2f0c71378c8f1a62c
2014-02-24 15:35:13 -06:00
Ron Anderson
5eb76e8ed6
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: 049424e5f045ccac08594364e7497c049424e5f045ccac08594364e7497c2db5f268404364e7497c2db5f268405831f8d79e7d3af157f83b2ea2d6acf2b0cc20e83c673caec2
2014-02-24 13:46:48 -06:00
Brian Clements
fcc6c7f221
Issue #2751 fixed leader transfer infinite loop, added event validation
...
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed
Former-commit-id: a1739724379217ba24c53f362519aaa1739724379217ba24c53f362519aa386e9cc96a3f362519aa386e9cc96a743c6cd74b73cb7b7313b9c9be4c4f4abf73785248cfc3c933
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
18980e6a8c
Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
...
Former-commit-id: 152980350c780dc19fac70ae372303152980350c780dc19fac70ae372303e08d4f77c370ae372303e08d4f77c3d27c21b9f67aca322faaa6bf8965937e29aa25a907ffe9f711
2014-02-21 17:37:19 -06:00
Mike Duff
b74ed7f1fe
Issue #2631 - Set preference defaults in the Activator.
...
Removed unused file.
Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e
Former-commit-id: 9eafacaac2a96a833f51ed5cb914069eafacaac2a96a833f51ed5cb91406a7b1e79d2ded5cb91406a7b1e79d2d5754117aadf98eec12b9d90f4495c25014499431692830c5c9
2014-02-20 15:09:10 -06:00
Brian Clements
49b39bcaf6
Issue #2751 collab menu icons, fixed NPE
...
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog
Former-commit-id: 8bbf2bb6bda2bdfa25ccaaa2de20f48bbf2bb6bda2bdfa25ccaaa2de20f489a48c3f6baaa2de20f489a48c3f6be7584f3a4904697836b84b7ba54dc3e3973b9fc71d2406e180
2014-02-20 11:50:54 -06:00
Brian Clements
cbef95a1bb
Issue #2751 implemented room/topic ownership transfer
...
Former-commit-id: 4e165aba58a8ff1effc1c3cadff7054e165aba58a8ff1effc1c3cadff705ab72938246c3cadff705ab7293824608a0e5baf29d00fe2babd9ac2c0037d218686d1f9b0fd74f5b
2014-02-20 11:10:14 -06:00
Nate Jensen
e2baae15ac
Issue #2704 fix startup issues where settings are valid but dialog
...
doens't realize it
Former-commit-id: 6973755f4e6ef26a636c32bd9fd6356973755f4e6ef26a636c32bd9fd6350f81b8046732bd9fd6350f81b804675d5518e29f6e2150ccd79f33e97c1b1f5f895dcf3955f66213
2014-02-20 10:53:21 -06:00
Nate Jensen
714a282a4f
Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
...
Former-commit-id: adb51300d84563e38db23078b69273adb51300d84563e38db23078b692735856957c573078b692735856957c5708ede8e9f3c936a659a55412b72c579e261c9c224628b0c67c
2014-02-19 17:22:00 -06:00
Nate Jensen
9cfc792b03
Merge "Issue #2761 add region level to localization" into development
...
Former-commit-id: f939d93d7f3782880dac9011e1b31ef939d93d7f3782880dac9011e1b31e6e59175ce49011e1b31e6e59175ce48a564e99879394879520b1e27889588f735110861db1ae5a38
2014-02-19 17:18:24 -06:00
Nate Jensen
8ee4ae7565
Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
...
Former-commit-id: f545a8a74da241472c34df376abcb7f545a8a74da241472c34df376abcb7f99cf7df47df376abcb7f99cf7df47eeac24c773d3ec0da1bb8b152a8027dafb323edbdbdcfa8e41
2014-02-19 16:19:27 -06:00
Ron Anderson
60569c9c0d
Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
...
Former-commit-id: dab0ebc99e8703c4393798d2417f94dab0ebc99e8703c4393798d2417f94b8c00d8ead98d2417f94b8c00d8eadefbe57d909b9904edc3a7e7f0abfdcdb9cc1e6b5331803d94a
2014-02-19 15:39:56 -06:00
Mike Duff
352b114250
Issue #2631 - Add sound preference for users joining a room.
...
review comments
Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207
Former-commit-id: 659cb1f2a0e2a6251a6b663ea8decd659cb1f2a0e2a6251a6b663ea8decd95fcee385a663ea8decd95fcee385aa723f69ad989c4a3e04b3100a71f3492d356f4f0401973b39e
2014-02-19 15:26:14 -06:00
Mike Duff
e24f7edcf7
Issue #2628 - Change cast from short to int for MPE colorbar
...
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c
Former-commit-id: 8a29af489448a0b34b5f682c6af4568a29af489448a0b34b5f682c6af456183657fb33682c6af456183657fb3310765884a38be2622f8586fce9d54706b243a7fd0494f646ab
2014-02-19 15:20:29 -06:00
Nate Jensen
7c8349973f
Merge "Issue #2751 fixed chat room bugs" into development
...
Former-commit-id: 72acab26c3b4ac1867284b4cca776f72acab26c3b4ac1867284b4cca776fc72e2be9694b4cca776fc72e2be9697f1665f2eb5ef747c7037099b45023696937bfcc659bc630be
2014-02-19 14:52:24 -06:00
Ron Anderson
41a6f52eff
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 5f3248574f663cb4cb625258aecf455f3248574f663cb4cb625258aecf45419e9d0b8d5258aecf45419e9d0b8d84bea14340908e43039e8a41723ba6b0a4b63689e91fd1d683
2014-02-19 11:55:11 -06:00
Mike Duff
02fa72b0d0
Issue #2734 - default time range to 24 hours.
...
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d
Former-commit-id: c7e22b7b3bbc180503b119033601bfc7e22b7b3bbc180503b119033601bf0b316f7bd919033601bf0b316f7bd9bac3c8665806ed3db6907710724c5ae6fb8413b9304a9dc507
2014-02-19 10:23:48 -06:00
Matt Nash
fbe80195e5
Issue #2761 add region level to localization
...
Amend : Change comment now that we do not get file from localization
Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2
Former-commit-id: 1d6e1d443c3f67324d7c2d20e84f6a1d6e1d443c3f67324d7c2d20e84f6a18350195672d20e84f6a18350195679cb0b6d530ae1d36b6d0bb10484bd03b39e1d2bc1814b1448e
2014-02-19 10:01:25 -06:00
Brian Clements
c420979556
Issue #2751 fixed chat room bugs
...
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client
Former-commit-id: abc01f547506c16118e1dc074a9650abc01f547506c16118e1dc074a96503a135b8eacdc074a96503a135b8eac30027665ac77bb396c9abee7cdb71addc0945e40b47b194564
2014-02-19 08:32:26 -06:00
Mike Duff
3034d493af
Issue #2596 - Add check for null coordinates.
...
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75
Former-commit-id: a370e81065283b0c670ca6509aad8ca370e81065283b0c670ca6509aad8c9754f0d8dda6509aad8c9754f0d8dd5b1250208e40b0540830ecb0d45b247ba61e6b53a4ab323833
2014-02-18 17:32:32 -06:00
Nate Jensen
776486ec44
Merge "Issue #2756 new collaboration openfire plugin and http service" into development
...
Former-commit-id: 961239e181ac0a10678b020d54c48a961239e181ac0a10678b020d54c48ab08d96b1e8020d54c48ab08d96b1e82f1c0109b14bb0997749a6bb05f2e33c9ebe52d3337aa2f312
2014-02-18 14:51:13 -06:00
Nate Jensen
c70fc017b8
Merge "Issue #2793 improved collaboration disconnect handling" into development
...
Former-commit-id: d4cc8b18271738248facc63289fa14d4cc8b18271738248facc63289fa14b3c45b303cc63289fa14b3c45b303c61ec0df1c92e468e9ec1173c646576b1dc1e88491e6b1343b0
2014-02-18 11:22:19 -06:00
Brian Clements
db121a4efb
Issue #2793 improved collaboration disconnect handling
...
collaboration was being shutdown even though smack was trying to reconnect
changed to notify of disconnect, but not shutdown until reconnect fails
Former-commit-id: 1c8f5dd5799095a1584fa28fcf0dc51c8f5dd5799095a1584fa28fcf0dc57028f7fd4da28fcf0dc57028f7fd4d0d7ae9a2ff9d9c4c7c27510c39713f3bf2a08c57c38397e00b
2014-02-18 11:11:33 -06:00
Brad Gonzales
e906d71ac4
Issue #2771 For Data Delivery CAVE now request current id from
...
the registry EDEX. Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.
Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
Created ClusterIdUtil. DataDeliveryIdUtil uses that utility. It also verifies the id against the awips sites.
Changed centralRegistry.sh to set CLUSTER_ID to NCF.
Handle cases where site id is HAK or HUS.
Check for empty id setting in Cluster ID Util.
Return full id for Data Delivery ID.
Simplify Data Delivery ID and return Cluster ID.
Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911
Former-commit-id: 1d57e9f5f7379c0fb46c19460ed0d71d57e9f5f7379c0fb46c19460ed0d7ba4e30832819460ed0d7ba4e308328ae35320dd61b764881113be33809449aa1cb299eb0421675ff
2014-02-18 11:10:44 -06:00
Ron Anderson
c3b687b9a5
Merge branch 'master_14.1.1' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 410f956cffe7f2b6883d32bcf9d0d0410f956cffe7f2b6883d32bcf9d0d014a082a4e932bcf9d0d014a082a4e98779564e3a0135771eecd4ba9eba9468e03bf02f8a7af092f2
2014-02-18 10:45:20 -06:00
Brian Clements
c0da4f94d4
Issue #2756 new collaboration openfire plugin and http service
...
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML
Former-commit-id: 68fac79fe7f0c89ef6c6f6b282743468fac79fe7f0c89ef6c6f6b28274345b4f1e8288f6b28274345b4f1e828874d08f1d1902319f36e4a1d9e40bd45889341612f866ac4365
2014-02-18 10:03:12 -06:00
Nate Jensen
39c0ec7c2c
Merge "Issue #2751 fixed blocked icon for roster entries" into development
...
Former-commit-id: 35b4de06400228d24f1de70f0d21ab35b4de06400228d24f1de70f0d21abaa7413fd4ce70f0d21abaa7413fd4cf348686037c3756326a6f1b7bf1c2aa08dea4b0872a40614fb
2014-02-18 08:48:00 -06:00
Brian Clements
393036071a
Issue #2751 fixed blocked icon for roster entries
...
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels
Former-commit-id: ab8f47413fe894019715a94b366e26ab8f47413fe894019715a94b366e263307f5ea5ea94b366e263307f5ea5ef5a25c903002d3a9ae7e476d0c32576574733ebadf4c4af7e9
2014-02-17 17:11:36 -06:00
Nate Jensen
8e8e9141e7
Issue #2704 fix alertviz connectivity checks
...
Former-commit-id: 742217ded00160ab04640c4de50218742217ded00160ab04640c4de502184d689945250c4de502184d6899452560fd298721121bcd184a228ab8dd60944df080f40dd9cd1094
2014-02-17 17:10:07 -06:00
Brian Clements
bc8a458ec1
Issue #2800 added equals/hashcode to classes used in roster tree
...
tree view uses hashmap to decide if a node is new
tree was collapsing groups/sessions on refresh since it thought they were new nodes
Former-commit-id: ca8869b8ef6d716863323b5648c055ca8869b8ef6d716863323b5648c0553dfd8fbafb3b5648c0553dfd8fbafb430832e3e50d07e417fc9dc2967e3fcd7abc37fcfab5759a01
2014-02-17 16:39:43 -06:00
Nate Jensen
f1bcc326a2
Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
...
Former-commit-id: a416577b252367c79c1c5675869906a416577b252367c79c1c5675869906f4260a617e5675869906f4260a617e7ad4c20f9c1639f43f5096014c806de4fb5e0067083a66dc4e
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
52842bed96
Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
...
Former-commit-id: 386b6a24992cf496ca84937b3071d4386b6a24992cf496ca84937b3071d4ca90137801937b3071d4ca90137801028bfc35f6fb5b367ecc0f6f60a13247c3c6845be0c97ad986
2014-02-17 14:02:57 -06:00
Nate Jensen
9c67149bf9
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: 34c7c3cba1c8e70cd6b115ff4ab5d734c7c3cba1c8e70cd6b115ff4ab5d72486e3919215ff4ab5d72486e3919262739b7936b801b36ca70314d61773e6dae7a23c695d03b815
2014-02-17 11:58:04 -06:00
