Steve Harris 4d8d9354e7 Issue #1871 - Merge branch 'vlab' into development ... Conflicts: edexOsgi/com.raytheon.uf.common.base.feature/feature.xml Former-commit-id: 3e66acde96 [formerly 3745089239] [formerly 3e66acde96 [formerly 3745089239] [formerly 26bf27c70d [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]] Former-commit-id: 26bf27c70d Former-commit-id: 629e76e0ff [formerly 1691fa413c] Former-commit-id: 9704fd6a82		2013-05-30 14:33:24 -05:00
..
raytheon	Issue #1871 - Merge branch 'vlab' into development	2013-05-30 14:33:24 -05:00