tree 75bb50b68866be4f92ff54447da844631bffde91
parent 740f2c73f1f5dbb5eafbdb3a29f37e06dc1da594
parent 356c64615cef797d5e8143878047119ff7bc4fff
author Markus Keller <markus_keller@ch.ibm.com> 1484741188 +0100
committer Markus Keller <markus_keller@ch.ibm.com> 1484741188 +0100

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

Conflicts:
	org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
	org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java