tree 4dc876167a95c09338eabbedb11d75de3cbf5c35
parent 1b8984cf7c0c81d93482b36f1e04cc6574a6811f
parent efe0381f2d9d1a2232e64c35692e2c4885a170ae
author Nitin Dahyabhai <nitind@us.ibm.com> 1348605568 -0400
committer Nitin Dahyabhai <nitind@us.ibm.com> 1348605568 -0400

Merge branch 'master' into R3_4_maintenance

Conflicts:
	features/org.eclipse.wst.web_core.feature/feature.xml
	features/org.eclipse.wst.web_sdk.feature/feature.xml
	features/org.eclipse.wst.web_ui.feature/feature.xml