tree e4ae2951424ca2a1ad61e5d0e1a4721039e1d0e4
parent 0105f8633413ddbe9988ba8581b773c05ce21682
parent 328579c2818b833dfb307075410ce910378d7292
author Markus Keller <markus_keller@ch.ibm.com> 1394652906 +0100
committer Markus Keller <markus_keller@ch.ibm.com> 1394652906 +0100

Merge branch 'BETA_JAVA8' into BETA_JAVA8_LUNA

Conflicts:
	org.eclipse.jdt-feature/feature.xml
	org.eclipse.jdt-feature/pom.xml