Bryan Kowal
bd47c62789
Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
...
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6
Former-commit-id: 03a2e82b77
[formerly 03a2e82b77
[formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: 5816ddaf77
2013-04-03 18:27:10 -05:00
Nate Jensen
5be8ef079e
Merge "Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. Change reviewer comments." into development
...
Former-commit-id: 79a9d76915
[formerly 79a9d76915
[formerly eaabe1a4935051d003ed302de193cfb183118845]]
Former-commit-id: 73d86e8926
Former-commit-id: c87d157cbd
2013-04-03 17:28:49 -05:00
Roger Ferrel
ad658b46bf
Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
...
Change reviewer comments.
Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d
Former-commit-id: 54cbf656e9
[formerly 54cbf656e9
[formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]
Former-commit-id: d2aae617b2
Former-commit-id: 7b829a2fec
2013-04-03 12:48:18 -05:00
Ben Steffensmeier
15be152be1
Issue #1824 Fix Tile Geometry creation.
...
Former-commit-id: fedbc28588
[formerly fedbc28588
[formerly 9c77d1a4d12dd8fd0c684bd48a7fc1a02a34dbac]]
Former-commit-id: cfcc33cd7b
Former-commit-id: 58d81f6556
2013-04-03 10:59:11 -05:00
Nate Jensen
d1f53fb57e
Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
...
Former-commit-id: f57358cff8
[formerly f57358cff8
[formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 374eed35b3
2013-04-02 14:29:15 -05:00
Dustin Johnson
15ed8a6f58
Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
...
Amend:
Use TimeUtil.newGmtCalendar() and remove whitespace only change
Add TODO for point data types.
Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3
Former-commit-id: c981b7250f
[formerly c981b7250f
[formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]
Former-commit-id: 6129d86be4
Former-commit-id: dd8f4d8454
2013-04-01 15:35:51 -05:00
Max Schenkelberg
80b0f7c159
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
...
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: b32fbad9c8
[formerly b32fbad9c8
[formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]
Former-commit-id: 547190329b
Former-commit-id: 635388a7ad
2013-04-01 12:41:50 -05:00
Lee Venable
e66a72fbed
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
...
Former-commit-id: 4a8c4b64df
[formerly 4a8c4b64df
[formerly 9c117d43e77ffa074c8464771918116f8835b382]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 35d27f89f1
2013-04-01 12:26:23 -05:00
Steve Harris
d0e61c59e8
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 140765a43e
[formerly 140765a43e
[formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]
Former-commit-id: 437a04011a
Former-commit-id: 0b48e96314
2013-04-01 12:19:04 -05:00
Steve Harris
0fee31b1a8
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
...
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: 74a47b9bd9
[formerly 74a47b9bd9
[formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]
Former-commit-id: 14c9de2259
Former-commit-id: a6dd28cc82
2013-04-01 12:15:04 -05:00
Lee Venable
e0d1017c14
Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
...
Former-commit-id: fe89cb7fe4
[formerly fe89cb7fe4
[formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]
Former-commit-id: d3390596f4
Former-commit-id: 89da26a266
2013-04-01 12:06:16 -05:00
Steve Harris
50becef97f
13.3.1-17 baseline
...
Former-commit-id: 7bf9966dcb
[formerly 7bf9966dcb
[formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
2013-04-01 12:04:56 -05:00
Steve Harris
c53a305b1e
13.3.1-16 baseline
...
Former-commit-id: 51380726d4
[formerly 51380726d4
[formerly 18321f88c2efedf141b84e7de18c200e1037f740]]
Former-commit-id: 3066dd33e5
Former-commit-id: 36a4b3eb51
2013-04-01 11:39:08 -05:00
Mike Duff
63489a0873
Issue #1830 - Don't allow base level config files for FFMP
...
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: 261a39122d
[formerly 261a39122d
[formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]
Former-commit-id: 9c2ac87482
Former-commit-id: 11ca7c2c20
2013-04-01 11:36:53 -05:00
Richard Peter
58a8049b64
Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
...
Former-commit-id: e221223f8a
[formerly e221223f8a
[formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]
Former-commit-id: 255617199c
Former-commit-id: ea4a599a5a
2013-04-01 11:33:59 -05:00
Steve Harris
4204273f21
13.3.1-15 baseline
...
Former-commit-id: eb1dab3864
[formerly eb1dab3864
[formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: 3d8ed484be
Former-commit-id: d3cec5d3cb
2013-04-01 11:33:20 -05:00
Max Schenkelberg
01c2d29c1b
Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
...
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments
Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835
Former-commit-id: 321a29ffa4
[formerly 321a29ffa4
[formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]
Former-commit-id: 51d976e5e2
Former-commit-id: 1c35a54a9f
2013-04-01 10:19:36 -05:00
Lee Venable
034e16baa7
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
...
Former-commit-id: 2875600910
[formerly 2875600910
[formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]
Former-commit-id: 0bfc05ce61
Former-commit-id: 3d683e98a9
2013-04-01 09:40:59 -05:00
Roger Ferrel
9e3bee6562
Issue #1790 Changes for non-blocking StationProfileDlg.
...
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: 0d269691e2
[formerly 0d269691e2
[formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]
Former-commit-id: d21cb5e2e8
Former-commit-id: 944d03615e
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
b3245f7a5d
Issue #1799 fix modal tools again.
...
Former-commit-id: eeeede7288
[formerly eeeede7288
[formerly c1a69f88df85478571394c0e125617c93100168d]]
Former-commit-id: 66af8daa11
Former-commit-id: 7082466303
2013-03-29 14:30:54 -05:00
Roger Ferrel
99ebeac6fd
Issue #1790 Changes for non-blocking StationListDlg.
...
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: c5a95dcb44
[formerly c5a95dcb44
[formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]
Former-commit-id: 6ad80607bc
Former-commit-id: de02460b11
2013-03-29 13:46:51 -05:00
Roger Ferrel
c1ffc82920
Issue #1790 Last of the bug fixes. Reviewer changes
...
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 8f4492c63c
[formerly 8f4492c63c
[formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]
Former-commit-id: 463407a40e
Former-commit-id: ec5f32aec6
2013-03-29 11:35:08 -05:00
Ron Anderson
41b0758084
Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
...
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089
Former-commit-id: 0f4fb125b0
[formerly 0f4fb125b0
[formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]
Former-commit-id: c7cfcf0250
Former-commit-id: 9cfa87f7e5
2013-03-29 10:48:26 -05:00
Nate Jensen
a6a81a17d6
Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
...
Former-commit-id: 214b2ed4ba
[formerly 214b2ed4ba
[formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]
Former-commit-id: 1bf37125c4
Former-commit-id: 711fbe98d2
2013-03-28 17:02:14 -05:00
Ben Steffensmeier
a5e1593213
Issue #1799 fix activation of tools for new perspectives.
...
Former-commit-id: 50a276a7e2
[formerly 50a276a7e2
[formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]
Former-commit-id: 4efa92ff49
Former-commit-id: a415fb17ae
2013-03-28 15:47:36 -05:00
Ron Anderson
5eb1885dbd
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 5bb47b7931
[formerly 5bb47b7931
[formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]
Former-commit-id: b65ecfc151
Former-commit-id: 3f2fa771d9
2013-03-28 13:37:29 -05:00
Max Schenkelberg
223f946b90
Issue #1638 Fix merge error
...
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 573b441662
[formerly 573b441662
[formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: c9301b75ea
2013-03-28 10:20:54 -05:00
Lee Venable
adbaebd457
Merge "Issue #1790 Bug fixes for SCAN." into development
...
Former-commit-id: e7805ded92
[formerly e7805ded92
[formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]
Former-commit-id: 167fa6eadf
Former-commit-id: 772bbe23a7
2013-03-28 10:04:34 -05:00
Roger Ferrel
3bb55722f5
Issue #1790 Bug fixes for SCAN.
...
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65
Former-commit-id: 9c560ab626
[formerly 9c560ab626
[formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]
Former-commit-id: e204276c17
Former-commit-id: 216fa1b23b
2013-03-28 09:16:24 -05:00
Roger Ferrel
c354469c78
Issue #1790 bug fix for GFE dialogs in ticket 1353.
...
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612
Former-commit-id: 98d056c3a1
[formerly 98d056c3a1
[formerly ee4a6d815bc85f861bb7d77719c5787343625741]]
Former-commit-id: 4db9e20fbf
Former-commit-id: b95a38db32
2013-03-28 09:04:10 -05:00
Steve Harris
90ec2d3fbf
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 9a321b6ac8
[formerly 9a321b6ac8
[formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]
Former-commit-id: 3073951b3d
Former-commit-id: a4bf236cc7
2013-03-27 22:16:15 -05:00
Roger Ferrel
36219d5090
Issue #1790 Bug fix for dialogs in ticket 1578
...
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90
Former-commit-id: a8410499bc
[formerly a8410499bc
[formerly 9bc7fe4c771e534148b446d33de969ef53be3b0d]]
Former-commit-id: 1129728e03
Former-commit-id: 56ca204764
2013-03-27 21:54:26 -05:00
Steve Harris
f3a84e952e
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: 2a0e399dc8
[formerly 2a0e399dc8
[formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]
Former-commit-id: d997aeaee4
Former-commit-id: e67b16bb03
2013-03-27 18:21:05 -05:00
Steve Harris
8237fdadaa
13.3.1-14 baseline
...
Former-commit-id: 9022c500ce
[formerly 9022c500ce
[formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9fba973fd0
Former-commit-id: 2ca160caf0
2013-03-27 17:59:34 -05:00
Roger Ferrel
1b74b2d4a4
Issue #1790 Bug fixes for ticket 1353.
...
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc
Former-commit-id: 04b57a8582
[formerly 04b57a8582
[formerly e0c3e3b81f679985a048047b3e5aa69992577d78]]
Former-commit-id: 391ce5687b
Former-commit-id: 726b5de0c5
2013-03-27 16:56:17 -05:00
Dustin Johnson
c5685dbe9f
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: 52c27ec57f
[formerly 52c27ec57f
[formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]
Former-commit-id: 1684507bdb
Former-commit-id: f27ebfbc1b
2013-03-27 15:38:36 -05:00
Roger Ferrel
d504643687
Issue #1790 Fix dialog in current phase.
...
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b
Former-commit-id: d69674d595
[formerly d69674d595
[formerly 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54]]
Former-commit-id: 1093c020e6
Former-commit-id: 68ba7cab75
2013-03-27 14:11:36 -05:00
Nate Jensen
9c7466b8e9
Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
...
Former-commit-id: faf937d3b0
[formerly faf937d3b0
[formerly 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac]]
Former-commit-id: f8e5534417
Former-commit-id: a7548df695
2013-03-27 11:32:19 -05:00
Nate Jensen
9353bd7d8b
Merge "Issue #1735 Performance improvments for LLWSData." into development
...
Former-commit-id: ff7631d847
[formerly ff7631d847
[formerly 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa]]
Former-commit-id: b44db0bc2c
Former-commit-id: 314c5dcb2e
2013-03-26 16:28:38 -05:00
Nate Jensen
79fddbcbf5
Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
...
Former-commit-id: f3fd91c311
[formerly f3fd91c311
[formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]
Former-commit-id: c895ee60fa
Former-commit-id: 5701030750
2013-03-26 16:15:27 -05:00
Lee Venable
f0ed70f9fb
Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
...
Former-commit-id: 1a59204892
[formerly 1a59204892
[formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]
Former-commit-id: 049e955db9
Former-commit-id: f8d2fdacea
2013-03-26 15:01:51 -05:00
Ben Steffensmeier
b76bdc602d
Issue #1791 Fix problems in SmartScript when there is no data.
...
Former-commit-id: 6870045005
[formerly 6870045005
[formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]
Former-commit-id: 18311b0d18
Former-commit-id: 69879c51df
2013-03-26 14:46:11 -05:00
Lee Venable
ea68209a19
Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
...
Former-commit-id: c86daf885b
[formerly c86daf885b
[formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]
Former-commit-id: c1adce3a11
Former-commit-id: 393e6d9ca1
2013-03-26 14:33:24 -05:00
Steve Harris
fdd07bd72c
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 5fcfaf4360
[formerly 5fcfaf4360
[formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]
Former-commit-id: 65df96a419
Former-commit-id: 346b97a39a
2013-03-26 12:47:40 -05:00
Steve Harris
779adedea9
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: e71c69c383
[formerly e71c69c383
[formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]
Former-commit-id: 9ff8a94193
Former-commit-id: b926ff60b3
2013-03-26 12:44:24 -05:00
Steve Harris
7aa4f7b265
13.3.1-13 baseline
...
Former-commit-id: c77a452f5a
[formerly c77a452f5a
[formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c65f3e68e5
Former-commit-id: 822d05a709
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
cc64195d47
Issue #1819 Added precision fields for point source configuration.
...
Former-commit-id: 79d87a96e7
[formerly 79d87a96e7
[formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]
Former-commit-id: b0f61cf86c
Former-commit-id: eb13af2f50
2013-03-26 12:29:18 -05:00
Ben Steffensmeier
3dbd9580c5
Issue #1782 fix merge problems related to graphics API.
...
Former-commit-id: 2b898e58c7
[formerly 2b898e58c7
[formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]
Former-commit-id: 6edee13cdd
Former-commit-id: 76a6213807
2013-03-26 12:06:45 -05:00
Ben Steffensmeier
69068bbf3a
Issue #1799 Fix pan/zoom when in views.
...
Former-commit-id: 643c1c77d0
[formerly 643c1c77d0
[formerly 2061956526bdc3da43280e6c829de1deb0a098ba]]
Former-commit-id: 78fdea2ba1
Former-commit-id: 5a1171f111
2013-03-26 11:44:23 -05:00
Steve Harris
e6ab1deba2
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: fd71e44f0f
[formerly fd71e44f0f
[formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]
Former-commit-id: a23cecdb26
Former-commit-id: e96e95b565
2013-03-26 10:12:34 -05:00