xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2394 commits 31 branches 40 tags 3.8 GiB
Commit graph

2394 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bryan Kowal
c5afa1883b Issue #1864 - datadelivery and kml are now dependent on the core viz feature. 
Former-commit-id: 64c54f2110 [formerly 3fac666de5 [formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]
Former-commit-id: 3fac666de5
Former-commit-id: 70c8ed6bc0
 2013-04-04 12:48:59 -05:00
Steve Harris
d331abc911 Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 731ed52cd6 [formerly 56410d2a04 [formerly 6e7c89a07a4105097de3ffa1b7522fdae93baa5b]]
Former-commit-id: 56410d2a04
Former-commit-id: 8b5b1d286b
 2013-04-04 12:01:23 -05:00
Steve Harris
4dfea33cdd Merge branch 'omaha_13.3.1' into development 
Former-commit-id: 5c9a6b83cc [formerly 8b607f8228 [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]
Former-commit-id: 8b607f8228
Former-commit-id: 9879b94de9
 2013-04-04 11:58:50 -05:00
Steve Harris
55655fdab9 Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1 
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18

Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.product.awips/awips.product
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py

Former-commit-id: d98a119f4d [formerly ea34b1db1e [formerly 735ce03302b54116c8545daf043585fb16fabd11]]
Former-commit-id: ea34b1db1e
Former-commit-id: 3487a41532
 2013-04-04 11:12:22 -05:00
Nate Jensen
59f084426c 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: 73d86e8926 [formerly 79a9d76915 [formerly eaabe1a4935051d003ed302de193cfb183118845]]
Former-commit-id: 79a9d76915
Former-commit-id: f43ac8bbc3
 2013-04-03 17:28:49 -05:00
Steve Harris
50106822ea 13.2.1-21 baseline 
Former-commit-id: 33bd359cfe [formerly d4358b93dc [formerly f80eddbb15e5ca1710c15d245957345d6f840546]]
Former-commit-id: d4358b93dc
Former-commit-id: a86d44584d
 2013-04-03 18:08:41 -04:00
Steve Harris
3aa43b1b0d 13.2.1-20 baseline 
Former-commit-id: 539faf0a71 [formerly 6a55bc5dff [formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]
Former-commit-id: 6a55bc5dff
Former-commit-id: ad663b925c
 2013-04-03 18:05:39 -04:00
Steve Harris
77c0dd0b55 Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1 
Former-commit-id: 327d05f3b5 [formerly 0f000f4485 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]
Former-commit-id: 0f000f4485
Former-commit-id: 2bc12f7a23
 2013-04-03 15:52:19 -05:00
Ron Anderson
492587b91c Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1 
Former-commit-id: c82968c1e6 [formerly de856db77a [formerly 53ace4843058424627c3b670caa77972ddbe01be]]
Former-commit-id: de856db77a
Former-commit-id: b880af3c48
 2013-04-03 15:25:52 -05:00
Richard Peter
7d2b8a7576 Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1 
Former-commit-id: 6d73e25290 [formerly d282a49b6f [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]
Former-commit-id: d282a49b6f
Former-commit-id: 920ba0628c
 2013-04-03 15:14:17 -05:00
Richard Peter
f0450ff6f2 Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1 
Former-commit-id: cfcacd20e9 [formerly cbbd9ab90d [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]
Former-commit-id: cbbd9ab90d
Former-commit-id: dd527a4ef2
 2013-04-03 15:13:26 -05:00
Steve Harris
e621424fcb 13.3.1-18 baseline 
Former-commit-id: ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: a2b098d86d
Former-commit-id: f3e79bcc9d
 2013-04-03 14:58:29 -05:00
Nate Jensen
52e83d902b Issue #1855 fix python threading in GFE procedures and smart tools 
Change-Id: I6420338991c1961ce63ff944b516925f83a12994

Former-commit-id: fe24e34163 [formerly e3462292ab [formerly c4549e0279a3026adc2f7b40bb272fc4f59acf59]]
Former-commit-id: e3462292ab
Former-commit-id: 5c830c3c9c
 2013-04-03 14:33:24 -05:00
Lee Venable
bd785bf5a4 Merge "Issue #1858 Handled creating a follow up when initial was created before 0z but issued after." into omaha_13.3.1 
Former-commit-id: ff910d99fc [formerly 40b8ecf27d [formerly ad96c48345c8b6f89ea337bd663cb7585981e941]]
Former-commit-id: 40b8ecf27d
Former-commit-id: c8549e67d6
 2013-04-03 14:14:41 -05:00
Nate Jensen
3334d9b065 Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1 
Former-commit-id: 1bc148b468 [formerly dbbad421db [formerly 0b617c32afd67c5f64efa89e18abfef0de51a00f]]
Former-commit-id: dbbad421db
Former-commit-id: a109ec4601
 2013-04-03 14:13:14 -05:00
Nate Jensen
869f5498f6 Issue #1562 max's fix for topo with custom colormaps 
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e

Former-commit-id: 6c711f037c [formerly 057a929903 [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]
Former-commit-id: 057a929903
Former-commit-id: d64e0a2a39
 2013-04-03 14:10:53 -05:00
Bryan Kowal
981638c532 Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode. 
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: ee8c99ef6e [formerly e788c7b471 [formerly cadc51640a1349742bde98a5ae7189d507391d7e]]
Former-commit-id: e788c7b471
Former-commit-id: d1663ea98b
 2013-04-03 14:03:54 -05:00
Bryan Kowal
2dbabffbe5 Issue #1661 - yajsw will now log to both the console and log file indefinitely 
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: 42ab5f4244 [formerly 939ff752e8 [formerly d19b2efc155e5834ee079bcfc88b0263f8652279]]
Former-commit-id: 939ff752e8
Former-commit-id: ad523b9cee
 2013-04-03 14:03:18 -05:00
Ron Anderson
3e61a80508 Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter 
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59

Former-commit-id: b703b4779e [formerly 3a3cdcbf46 [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]
Former-commit-id: 3a3cdcbf46
Former-commit-id: 34c8aad559
 2013-04-03 14:01:18 -05:00
Roger Ferrel
e87e4c869d 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: d2aae617b2 [formerly 54cbf656e9 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]
Former-commit-id: 54cbf656e9
Former-commit-id: f8d1a13c38
 2013-04-03 12:48:18 -05:00
Jonathan Sanchez
262f280821 Issue #1858 Handled creating a follow up when initial was created before 
0z but issued after.

Former-commit-id: 799b8c57ef [formerly 9c322bf4b7 [formerly b123df8e9dea005c35865f4a71ef28b1d9c8cba8]]
Former-commit-id: 9c322bf4b7
Former-commit-id: 9b547cab98
 2013-04-03 11:43:59 -05:00
Ben Steffensmeier
f8db56c0af Issue #1824 Fix Tile Geometry creation. 
Former-commit-id: cfcc33cd7b [formerly fedbc28588 [formerly 9c77d1a4d12dd8fd0c684bd48a7fc1a02a34dbac]]
Former-commit-id: fedbc28588
Former-commit-id: fe561d7af0
 2013-04-03 10:59:11 -05:00
Lee Venable
15c707ac50 Merge "Issue #1731 - fix problem with dmd updating." into omaha_13.3.1 
Former-commit-id: 7bdf9c3115 [formerly 0693b02556 [formerly 321f2a9f7b8c204937a8685b402b0f90db13f321]]
Former-commit-id: 0693b02556
Former-commit-id: 48433d4d37
 2013-04-02 17:46:48 -05:00
Mike Duff
335b85ea48 Issue #1731 - fix problem with dmd updating. 
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6

Former-commit-id: 23c8085402 [formerly 64cdb3c7fd [formerly a8c25cfced44c7e3edfd1b37af73b2af8753212b]]
Former-commit-id: 64cdb3c7fd
Former-commit-id: c3ab8259d5
 2013-04-02 16:22:23 -05:00
Greg Armendariz
b8e7d3644c Issue #1782 - Restoring #1813 & #1478 
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d

Former-commit-id: 54f56fde29 [formerly e5408c3807 [formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]
Former-commit-id: e5408c3807
Former-commit-id: f1776b887d
 2013-04-02 15:00:26 -05:00
Nate Jensen
cb6cd91f06 Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development 
Former-commit-id: 8f9ec8dd2c [formerly f57358cff8 [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]
Former-commit-id: f57358cff8
Former-commit-id: ab28523a09
 2013-04-02 14:29:15 -05:00
Bryan Kowal
3d13334576 Issue #1850 - the ebxml schema will now be created within the metadata database 
Former-commit-id: 2dbd62e9ce [formerly 8d63244b4e [formerly 0e7bcb156a4958639f38c83ae1d0e2f55398cb94]]
Former-commit-id: 8d63244b4e
Former-commit-id: d6e3d52126
 2013-04-02 10:49:46 -05:00
Dustin Johnson
5b7fcb1ce2 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: 6129d86be4 [formerly c981b7250f [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]
Former-commit-id: c981b7250f
Former-commit-id: 48a2002e68
 2013-04-01 15:35:51 -05:00
Max Schenkelberg
a59484e232 Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development. 
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Former-commit-id: 547190329b [formerly b32fbad9c8 [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]
Former-commit-id: b32fbad9c8
Former-commit-id: 9d032f3e84
 2013-04-01 12:41:50 -05:00
Lee Venable
6109daf744 Merge "Issue #1830 - Don't allow base level config files for FFMP" into development 
Former-commit-id: f1e8faf9ff [formerly 4a8c4b64df [formerly 9c117d43e77ffa074c8464771918116f8835b382]]
Former-commit-id: 4a8c4b64df
Former-commit-id: e994040887
 2013-04-01 12:26:23 -05:00
Steve Harris
5ec1c01d3a 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: 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]
Former-commit-id: 140765a43e
Former-commit-id: 736bb45741
 2013-04-01 12:19:04 -05:00
Steve Harris
d2d9195925 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: 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]
Former-commit-id: 74a47b9bd9
Former-commit-id: 3b722f1076
 2013-04-01 12:15:04 -05:00
Lee Venable
35413b2833 Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development 
Former-commit-id: d3390596f4 [formerly fe89cb7fe4 [formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]
Former-commit-id: fe89cb7fe4
Former-commit-id: 7d73b8dacf
 2013-04-01 12:06:16 -05:00
Steve Harris
1b8e623c9b 13.3.1-17 baseline 
Former-commit-id: a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: 7bf9966dcb
Former-commit-id: f28b85d42f
 2013-04-01 12:04:56 -05:00
Steve Harris
712c13a655 13.3.1-16 baseline 
Former-commit-id: 3066dd33e5 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]
Former-commit-id: 51380726d4
Former-commit-id: a262f22cee
 2013-04-01 11:39:08 -05:00
Mike Duff
eb0a77c8ac Issue #1830 - Don't allow base level config files for FFMP 
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: 9c2ac87482 [formerly 261a39122d [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]
Former-commit-id: 261a39122d
Former-commit-id: fa8ca827d1
 2013-04-01 11:36:53 -05:00
Richard Peter
b921a25faf Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development 
Former-commit-id: 255617199c [formerly e221223f8a [formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]
Former-commit-id: e221223f8a
Former-commit-id: 2fa88522ff
 2013-04-01 11:33:59 -05:00
Steve Harris
70fece2da1 13.3.1-15 baseline 
Former-commit-id: 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: eb1dab3864
Former-commit-id: 4cf3ad6abb
 2013-04-01 11:33:20 -05:00
Max Schenkelberg
6c1c9f25d5 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: 51d976e5e2 [formerly 321a29ffa4 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]
Former-commit-id: 321a29ffa4
Former-commit-id: a508e9c8cb
 2013-04-01 10:19:36 -05:00
Lee Venable
b100693786 Merge "Issue #1790 Changes for non-blocking StationListDlg." into development 
Former-commit-id: 0bfc05ce61 [formerly 2875600910 [formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]
Former-commit-id: 2875600910
Former-commit-id: 7389bf5b29
 2013-04-01 09:40:59 -05:00
Steve Harris
127cd26812 13.2.1-19 baseline 
Former-commit-id: fc859547f8 [formerly bebd9ad1f4 [formerly 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7]]
Former-commit-id: bebd9ad1f4
Former-commit-id: 88a4bb0924
 2013-04-01 10:11:24 -04:00
Roger Ferrel
7551b03bfe Issue #1790 Changes for non-blocking StationProfileDlg. 
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef

Former-commit-id: d21cb5e2e8 [formerly 0d269691e2 [formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]
Former-commit-id: 0d269691e2
Former-commit-id: e1b40f9f2f
 2013-03-29 17:11:02 -05:00
Ben Steffensmeier
0802c4cd3d Issue #1799 fix modal tools again. 
Former-commit-id: 66af8daa11 [formerly eeeede7288 [formerly c1a69f88df85478571394c0e125617c93100168d]]
Former-commit-id: eeeede7288
Former-commit-id: cffac354e8
 2013-03-29 14:30:54 -05:00
Roger Ferrel
6d83f23cc2 Issue #1790 Changes for non-blocking StationListDlg. 
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be

Former-commit-id: 6ad80607bc [formerly c5a95dcb44 [formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]
Former-commit-id: c5a95dcb44
Former-commit-id: 281e7f53cb
 2013-03-29 13:46:51 -05:00
Roger Ferrel
9c498726af Issue #1790 Last of the bug fixes. Reviewer changes 
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa

Former-commit-id: 463407a40e [formerly 8f4492c63c [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]
Former-commit-id: 8f4492c63c
Former-commit-id: 20f6baba0e
 2013-03-29 11:35:08 -05:00
Ron Anderson
d7f0cfe92d Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled. 
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089

Former-commit-id: c7cfcf0250 [formerly 0f4fb125b0 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]
Former-commit-id: 0f4fb125b0
Former-commit-id: 4ac9a4d9a8
 2013-03-29 10:48:26 -05:00
Ron Anderson
ef06834e54 Issue #1774 Fix invalid unit strings in parameterInfo files. 
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de

Former-commit-id: 679bb01764 [formerly aeb451a37c [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]
Former-commit-id: aeb451a37c
Former-commit-id: cfb324f380
 2013-03-29 10:07:37 -05:00
Greg Armendariz
466fa3fd41 Fix merge issue 
Former-commit-id: 5da06cadd7 [formerly cd5da3a6c5 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]
Former-commit-id: cd5da3a6c5
Former-commit-id: 611661ccc9
 2013-03-29 09:52:46 -05:00
Greg Armendariz
56f51657fd Change package location of import 
Former-commit-id: 27345f6edf [formerly d533c5c08d [formerly c158a7540d23451b864a1464ab64882c3d45386d]]
Former-commit-id: d533c5c08d
Former-commit-id: f778112c20
 2013-03-29 09:09:32 -05:00
David Gillingham
2ee53d54f5 Issue #1837: Provide better error logging when a map referenced in localMaps.py cannot be found in the database. 
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0

Former-commit-id: c9ed59b0e0 [formerly 8a7c965eaa [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]
Former-commit-id: 8a7c965eaa
Former-commit-id: 170f252bdd
 2013-03-28 17:18:43 -05:00