Ben Steffensmeier
9ccfcaecec
Issue #2269 Fix MDCRS data and switch acars to use nsharp.
...
Former-commit-id: fcf969bcc5d4b2bf52fb5fd84f4516fcf969bcc5d4b2bf52fb5fd84f4516f778b533105fd84f4516f778b53310074c2c56f2d7d0a426332d54492d7f62474b8798202dc2b6eb
2013-08-19 17:23:03 -05:00
Nate Jensen
63097f83b7
Merge "Issue #2260 Switch goessounding to NSharp. Change-Id: Ie78c4456758dcbce845cfb85da3e2e69ec74323b" into development
...
Former-commit-id: 5853ce39b79ac6600e92d5426a47ba5853ce39b79ac6600e92d5426a47ba2635170d1dd5426a47ba2635170d1dbc4a26bfd664e9f13e0a0c8619e01ee3bb60f9474b8a23b2fe
2013-08-19 17:22:48 -05:00
Ben Steffensmeier
a7aaaff245
Issue #2260 Switch goessounding to NSharp.
...
Change-Id: Ie78c4456758dcbce845cfb85da3e2e69ec74323b
Former-commit-id: 2f1a87f8f1aa204eba5e2f0c0c9cf22f1a87f8f1aa204eba5e2f0c0c9cf254310cd87e2f0c0c9cf254310cd87e473e12d269c48cda36c0d2237d9e4447b2fa3025084f6c8adc
2013-08-19 16:34:42 -05:00
Steve Harris
7a291e0bfb
13.5.1-17 baseline
...
Former-commit-id: fb9ab082552d882ccb549dd7dc5d20fb9ab082552d882ccb549dd7dc5d20b210c902459dd7dc5d20b210c902454fd40935397c0cf13ea8a192a3ebb1815bfe575c4bcb06cd63
2013-08-19 16:34:24 -04:00
Lee Venable
54a17b1440
Merge "Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog Peer review comments" into development
...
Former-commit-id: f666a24c7523dca45a0cb8d050a172f666a24c7523dca45a0cb8d050a1726f1e633d57b8d050a1726f1e633d5718b63c6cffa4cb2d6d21e1b9d4cf81cd7b1fdc0a71aa6f514f
2013-08-19 15:14:22 -05:00
Bryan Kowal
e20a010a87
Issue #2169 - gzip data uris; entities that receive data uris will unzip them before running thrift conversions.
...
- Amend: updates for 32-bit edex_com
- Amend: do not synchronize when building the message
- Amend: use the byte array pool
- Amend: default to data decompression when the queue is edex.alerts
Change-Id: I79a1f3d3d698c67019a4aa33e667fef99f6ebc17
Former-commit-id: 35cacacc457e61461e863eaacdb52235cacacc457e61461e863eaacdb5222e1a8eb2b33eaacdb5222e1a8eb2b399e3667a7818c90264555c0af47d6d6f246409fd7bcb1f4407
2013-08-19 12:06:30 -05:00
Lee Venable
3355d33a5e
Issue #2256 - Memory leak fixes and some code clean up fixes.
...
Change-Id: I7b16871f59e63218b1d5754ac460bbab056f78a5
Former-commit-id: 1b42530bd5212c830986752371bc631b42530bd5212c830986752371bc6349c06062fe752371bc6349c06062fe9df214963fc11caef6ca606c25c09323f828983af0ec3034d0
2013-08-16 15:04:28 -05:00
Mike Duff
e67de50fae
Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog
...
Peer review comments
Change-Id: I4b2eef5a0d0697e2f94aa7c59872c73cb3b350b0
Former-commit-id: e0ddf25ffb89cdc61d6570af70ba8de0ddf25ffb89cdc61d6570af70ba8d6190281e7770af70ba8d6190281e77a6241aa1f78d27c7b420c4c73b4e3bf22684b90be33069668b
2013-08-16 13:13:02 -05:00
Nate Jensen
06f7412df3
Merge "Issue #2260 Switch poessounding to NSharp. Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78" into development
...
Former-commit-id: 5b2e7006b6f5e84f17ea469df6d8065b2e7006b6f5e84f17ea469df6d806d28cb1ff68469df6d806d28cb1ff686d6c0d121b8f6f749c60b34d67ced3bca8f9f3ca7710ab9c0e
2013-08-16 10:06:32 -05:00
Lee Venable
5325f580ed
Merge "Issue #2143 - Fix various issues with SCAN/DMD/TVS" into development
...
Former-commit-id: 7be73d7d2d65b9b35dbeec5668caef7be73d7d2d65b9b35dbeec5668caeffbb341f176ec5668caeffbb341f176a94230dbe5de18cd342dfaaeb93c7d823e1c3562930524f962
2013-08-16 08:32:25 -05:00
Ben Steffensmeier
77f32fb76b
Issue #2260 Switch poessounding to NSharp.
...
Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78
Former-commit-id: 63604dad27fb23de355e36a920333f63604dad27fb23de355e36a920333f74b0b57f4b36a920333f74b0b57f4b644b43649aad82565d1a94e79ff7b4e24647553fd9932b5ce1
2013-08-15 17:51:52 -05:00
Nate Jensen
98648d5e15
Merge "Issue #2258 Convert profiler sounding to var height with hodo. Change-Id: I7b8c704ebc847169c2d09bb0bea13d0b60a9cff6" into development
...
Former-commit-id: 1b7c95291f0f006e221eb92b67676c1b7c95291f0f006e221eb92b67676ce4825013ddb92b67676ce4825013dd5d7f35f85078f8b742a6925478cac7d0514389aa312256254d
2013-08-15 17:46:59 -05:00
Ben Steffensmeier
a9abfb00e7
Issue #2258 Convert profiler sounding to var height with hodo.
...
Change-Id: I7b8c704ebc847169c2d09bb0bea13d0b60a9cff6
Former-commit-id: e401fe335fb7b18e02bf0c2f894b82e401fe335fb7b18e02bf0c2f894b8232a0b19a380c2f894b8232a0b19a387811f7c18b890eaa3751f75824d4bc766fadfa677ea9607352
2013-08-15 16:15:15 -05:00
Nate Jensen
8166f082b1
Merge "Issue #2033 moved avnfps and text workstation files into respective plugins." into development
...
Former-commit-id: 6643be23ad65753deffead209867bd6643be23ad65753deffead209867bd5ad699cd5bad209867bd5ad699cd5b64089c2441b322a51e1e313eeaac9e5ec88138d637b276d43f
2013-08-15 16:07:42 -05:00
Max Schenkelberg
b64a9336a9
Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
...
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7
Former-commit-id: 54b4b759fd5a4d880498e85d66f4e554b4b759fd5a4d880498e85d66f4e53800aec9e6e85d66f4e53800aec9e639cdbf728f352e21ffd3d89d13d029ee686157866709242e36
2013-08-15 15:50:40 -05:00
Mike Duff
e9fd7208be
Issue #2143 - Fix various issues with SCAN/DMD/TVS
...
Change-Id: Ice9a0f13881c31ca1d51f2f2158f74caa064f1f8
Former-commit-id: 71d725ae07e31a6c3426c871d6a1cd71d725ae07e31a6c3426c871d6a1cd640a154647c871d6a1cd640a154647f84671f284136a98785b03b3b3860a976e9956d6aac43728d3
2013-08-15 14:14:07 -05:00
Max Schenkelberg
c451c3f485
Issue #2189 Added a FontType option when initializing a font from a file.
...
Change-Id: I54973b7c380b1535dd1e1f7fb49fd0b74b3d1752
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments
Former-commit-id: 59f3945002b07ed474e3eab65aab5a59f3945002b07ed474e3eab65aab5a570266eb7beab65aab5a570266eb7b43fc7e0b4372fbe0208e5840d99a954191582186b75d942133
2013-08-15 13:51:07 -05:00
David Gillingham
3b668e4071
Issue #2262 : Fix ImportError and misnamed method in meteolib.py.
...
Change-Id: Ic6eb7de7b8c5b6ff7fbd989a43d00c97ea688364
Former-commit-id: d43d6506faa8868c5beb8ef34db798d43d6506faa8868c5beb8ef34db798953fc192a18ef34db798953fc192a1be64302011afbb147ef6a4ed28a3843d3f785fddff61a0701c
2013-08-15 13:14:39 -05:00
Steve Harris
542323ab42
Merge branch 'omaha_13.5.1' (13.5.1-16) into development
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
nativeLib/edex_com/.cproject
Former-commit-id: 56416708fc3f8cc1daf38484f03bb856416708fc3f8cc1daf38484f03bb8891f00d6508484f03bb8891f00d650aba7f09b152681f1f04544251fd949e2a322158b52564dc43c
2013-08-15 12:50:08 -05:00
Steve Harris
adaa30e7f5
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Former-commit-id: 8f0b0c151408b105a492727eba03b98f0b0c151408b105a492727eba03b9a687da6075727eba03b9a687da607527a5acb143e5c50ad0b6522867f06808a7c0831ff8442ee983
2013-08-15 12:46:48 -05:00
Steve Harris
ca5109f3d6
13.5.1-16 baseline
...
Former-commit-id: 47130c98a56818d80085cd3b63d96147130c98a56818d80085cd3b63d9617ce0234d76cd3b63d9617ce0234d76ca5796e082e881ff6271d7b1ed4900af2b4495bbff03caef3d
2013-08-15 13:40:37 -04:00
Max Schenkelberg
3c02342d04
Issue #2033 moved avnfps and text workstation files into respective plugins.
...
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2
Former-commit-id: db24201469bbad83c21a6f60751ec6db24201469bbad83c21a6f60751ec6c5575f96246f60751ec6c5575f962462f4f1bafb8139e0dfb78de539020d451eb54a36f553c93092
2013-08-15 12:21:43 -05:00
David Gillingham
2e5e666153
Issue #2262 : Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into
...
Java. Convert to use of these new methods where possible. Create unit tests.
Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d
Former-commit-id: bd9b224ff5c17f8b44090b6b0e06ccbd9b224ff5c17f8b44090b6b0e06cc40b5d54bf30b6b0e06cc40b5d54bf3218ec396969c656c28b98d347252d2f46f62ff2ea217ce6044
2013-08-15 11:30:45 -05:00
Jonathan Sanchez
04a7a8be95
Issue #2243 Resolved timing issues.
...
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34
Former-commit-id: 6902b263e578b655fd1f2b849d70036902b263e578b655fd1f2b849d7003bc30396b632b849d7003bc30396b6393efe34bc119853a4b57fca67fb4cadbb60f2c13a1dc6ac50b
2013-08-15 10:56:37 -05:00
Ron Anderson
69d5f7a845
Merge "Issue #1133 Better error handling for invalid polygons in map resource. Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442" into development
...
Former-commit-id: d70ba1184d5afcf8bee22b491f11add70ba1184d5afcf8bee22b491f11adca560e5fc02b491f11adca560e5fc0afcfafb0277924115bbc86b10cfd4b6ae94c0f656a8381426a
2013-08-15 10:50:57 -05:00
Ben Steffensmeier
a19d136402
Issue #1133 Better error handling for invalid polygons in map resource.
...
Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442
Former-commit-id: b887dcbe6daa08c8af4227594e6808b887dcbe6daa08c8af4227594e68087f9bbf3d5227594e68087f9bbf3d526b5e7b465bb970d2ffbb5b51795a18717b078a6a8830b5717f
2013-08-15 10:32:28 -05:00
Richard Peter
175d2fe542
Issue #1977 : Fix merge issue with WarngenDialog
...
Former-commit-id: 4dc2cdd1d48ba6abf6427c03fc955b4dc2cdd1d48ba6abf6427c03fc955ba5383dbfa47c03fc955ba5383dbfa4309c524817c8ad0e3317951bb37cd76ebc5d67bd0e62a4243e
2013-08-14 15:33:02 -05:00
Richard Peter
e6a36eb12a
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
...
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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: 181df35afc1f32ef9c7a5e5047cc4f181df35afc1f32ef9c7a5e5047cc4f2a9276c7285e5047cc4f2a9276c72884bef1f2ecc0b0eef331db7c941f6f9cf5e247ab42c78326f1
2013-08-14 15:23:18 -05:00
Richard Peter
f48818579c
Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 9ff9054d7e2608dfe1d8c61afa1bfa9ff9054d7e2608dfe1d8c61afa1bfaee6b9eb11ac61afa1bfaee6b9eb11a28a53c8a333f65eaf74b58a4aaa0807ca1edf371a7075027be
2013-08-14 14:29:55 -05:00
Nate Jensen
10a705f87d
Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development
...
Former-commit-id: 9407a5202a3b97de573a9776721a469407a5202a3b97de573a9776721a460947f358b19776721a460947f358b1edbd00224d49567ae86cb1882e2e4201ee796921bc7cbd4aba
2013-08-14 12:55:15 -05:00
Richard Peter
3a2237fcd6
Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development
...
Former-commit-id: 2169c7ae7172ecb0b995cfe449d8382169c7ae7172ecb0b995cfe449d838045d3cd618cfe449d838045d3cd618143973d9d0f02fc500313f456db0f1f8f31253ce6c9e009af6
2013-08-14 10:53:53 -05:00
Mike Duff
bf7bfbb742
Issue #2247 - Fix permission displays in UserAdmin Dialogs
...
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4
Former-commit-id: 3959e7e9f8e319928638097028ec593959e7e9f8e319928638097028ec59e791617acc097028ec59e791617accd0df6c3107b70b7a0681081d30db4f242f34efa9622f835330
2013-08-14 10:13:05 -05:00
Steve Harris
a700182250
13.5.1-15 baseline
...
Former-commit-id: b05abcaec0535218c67653e96e21dbb05abcaec0535218c67653e96e21dbc6dc1817e753e96e21dbc6dc1817e76f1b6d494f4f9288e7c165beefde589ea3f0c215d0be6956e9
2013-08-14 10:24:26 -04:00
Max Schenkelberg
b57cf3de95
Issue #2033 moved bundles and menu files into corresponding plugins
...
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc
Former-commit-id: 9be1171c336c92aa9dd75ab8b6e2c69be1171c336c92aa9dd75ab8b6e2c606dbae8bdb5ab8b6e2c606dbae8bdb41cc45e8fc2fc5af010d759ff7bcfd961ed891c8229e0ee235
2013-08-14 09:20:28 -05:00
Steve Harris
a338706fa4
13.5.1-14 baseline
...
Former-commit-id: c6465a3398b848317203d695e5debec6465a3398b848317203d695e5debe80e5f7fbd4d695e5debe80e5f7fbd44e753331559bd983e2fecd5b1e9e2f0f3ffc3892f4262380d6
2013-08-14 10:07:41 -04:00
Jonathan Sanchez
1e5c5696b5
Issue #2243 Resolved incorrect import.
...
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb
Former-commit-id: 714982e96f52d7862d36c6b6576f01714982e96f52d7862d36c6b6576f01fd0f2f1c09c6b6576f01fd0f2f1c09aafcbe9520718905768270bb266da777a919a7e8c2e2741ad6
2013-08-13 20:47:49 -05:00
Nate Jensen
28f3475d8a
Issue #2262 create new wxmath plugin seeded by Java derivparam functions
...
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2
Former-commit-id: 9df41ff24623fe237b7e09872d67139df41ff24623fe237b7e09872d6713959b50d18409872d6713959b50d184dde8a77452aaee338f5c44ef7566275a2c7fd36f2bed514c66
2013-08-13 16:59:57 -05:00
Richard Peter
a100febd89
Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
...
Former-commit-id: 4dd1b27e442b23cb871e6efc27c1b14dd1b27e442b23cb871e6efc27c1b1d5130432a86efc27c1b1d5130432a80c915ec5dce28de494e92fc754b8996e3624d1a748e9e757e9
2013-08-13 16:45:37 -05:00
Jonathan Sanchez
0487e62197
Issue #2243 Fixed update list bugs.
...
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f
Former-commit-id: dc2363ffd78d0ee7f5cad685125b25dc2363ffd78d0ee7f5cad685125b2549f488a58fd685125b2549f488a58f3806121231d33332bd5896c88ad28b721b2c7c04ba585b9424
2013-08-13 16:30:05 -05:00
Greg Armendariz
09e31f389a
Merge "Issue #2164 - fix 13.6.1 build" into development
...
Former-commit-id: 0e4fb546168bcfc737e634b428b5a00e4fb546168bcfc737e634b428b5a084413bd66f34b428b5a084413bd66f23c92a058002dfe84d31dbae6131cbe5399de2a20995174c2e
2013-08-13 12:34:04 -05:00
Nate Jensen
346e1d1fb7
Issue #2197 cherry picking 2197 into 13.5
...
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 9a01271f5fa9815b055115405cab1b9a01271f5fa9815b055115405cab1b63b2fe798a15405cab1b63b2fe798ae63e7120e5464a104dc13be446fca896214e95547e35afdd49
2013-08-13 12:27:02 -05:00
Bryan Kowal
6afd751590
Issue #2164 - fix 13.6.1 build
...
Former-commit-id: 17c4406504dbaa6da3ea460465324117c4406504dbaa6da3ea4604653241586b7646f04604653241586b7646f0ac9f30c364d96ca6737c8b3827c74564916e1833197cc17ce7
2013-08-13 11:13:52 -05:00
Nate Jensen
07c3bdd58b
Issue #2142 removing more dependencies on edex.common
...
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf
Former-commit-id: 5e24a11e0678256fd891df95db8f785e24a11e0678256fd891df95db8f780c92461c65df95db8f780c92461c65766da72c20988ac46c2bbf821fdbe0276f78d5f3bfca6dac18
2013-08-13 09:09:05 -05:00
Nate Jensen
ed59997955
Merge "Issue #2162 : Add performance logging for GFE edit area query evaluation." into development
...
Former-commit-id: 9424d4d05e9e283f0640bb955e6ee79424d4d05e9e283f0640bb955e6ee7e6fc534b8cbb955e6ee7e6fc534b8c6d5db1a0efc370d3b7d0ea4355e01874bf4205cbd9c2941c1d
2013-08-13 08:58:50 -05:00
Nate Jensen
4d525edaa5
Merge "Issue #2033 Fixed alertviz startup" into development
...
Former-commit-id: 74a6174e785b3334b2ff58e7b31de974a6174e785b3334b2ff58e7b31de9c62139c32758e7b31de9c62139c327b4d5ba2d2cd9e459094795010dbbf41b0049b36ba6ec68d567
2013-08-13 08:56:24 -05:00
Nate Jensen
387a90c721
Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development
...
Former-commit-id: 7bbc2ec7d7ce20de02a75948ebca877bbc2ec7d7ce20de02a75948ebca878101c961d45948ebca878101c961d4d037198231835516348f75f31b372eabbe1e21d0f1c8e329d9
2013-08-13 08:56:01 -05:00
Max Schenkelberg
e8ed9affda
Issue #2033 Fixed alertviz startup
...
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5
Former-commit-id: 7598c95fd9c825e2f0e249381ac4817598c95fd9c825e2f0e249381ac4813f35c335c949381ac4813f35c335c9971c4d5184c34cc88aa817a28bf292c292d1bdc0eacb9a3696
2013-08-12 17:37:15 -05:00
Nate Jensen
90f625f6f9
Issue #2142 more removing of dependencies from common plugins to edex.common
...
Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f
Former-commit-id: c137e9219823802cfe0228c79d0a56c137e9219823802cfe0228c79d0a56c2bf2163d928c79d0a56c2bf2163d9342649b95b2117ec71c6018845db8ff0a8895a983801d84a2f
2013-08-12 15:41:39 -05:00
Roger Ferrel
7678e266b8
Issue #2224 Changes to have DataSet in configuration.
...
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8
Former-commit-id: 09360f30c5705a3482f81863d4d65b09360f30c5705a3482f81863d4d65b3ecf95b18a1863d4d65b3ecf95b18a3ff13b5a3a8884343d893d9be94e7ee51bf3559c9dd8173991
2013-08-12 12:50:12 -05:00
David Gillingham
1134f407f6
Issue #2162 : Add performance logging for GFE edit area query evaluation.
...
Change-Id: I916750fd00549dc53b1dd645792c04f4f63aa338
Former-commit-id: 11384d2198ed39a866f007312fe01f11384d2198ed39a866f007312fe01f98f48e5a6407312fe01f98f48e5a64ef8d1ab050ffa45d26d90b8a48b12e235df668a698fdc5d1a1
2013-08-12 12:18:02 -05:00
