Richard Peter 2368697938 Merge branch 'omaha_13.5.1' (13.5.1-4) into development ... Conflicts: edexOsgi/build.edex/build.xml edexOsgi/com.raytheon.edex.feature.uframe/feature.xml Former-commit-id: 76bc31aa77 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]] Former-commit-id: 162261c395 Former-commit-id: edeb3e255b		2013-07-01 00:04:43 -05:00
..
com/raytheon	Merge branch 'omaha_13.5.1' (13.5.1-4) into development	2013-07-01 00:04:43 -05:00
dods/dap	13.3.1-12 baseline	2013-03-25 13:27:13 -05:00
oasis/names/tc/ebxml/regrep/xsd/rim/v4	Issue #1910 More registry object validators, shutdown BandwidthManagers in a finally	2013-05-03 08:25:25 -05:00