tree 0da41c30b25e1ed6ccaec24b0fdd6d589cc32c98
parent c222773c511566591c9a7c8ad404f3f850bf1806
parent 7824f8559cffef46b9d9e41c6c125659fda6fbe0
author Markus Keller <markus_keller@ch.ibm.com> 1441041823 +0200
committer Markus Keller <markus_keller@ch.ibm.com> 1441041823 +0200

Merge remote-tracking branch 'origin/master' into BETA_JAVA9_PATCH

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

=> kept the hard-coded feature version 3.11.0.v20150603-2000 from Mars