commit 02078836a81468ec1d6a9fb134ff530780199c54
author Stephan Herrmann <stephan.herrmann@berlin.de> Sun Dec 29 14:59:29 2013 +0100
committer Stephan Herrmann <stephan.herrmann@berlin.de> Sun Dec 29 16:24:28 2013 +0100
tree bb08d0dc3752696becafed91899440c8eae73457
parent 7c411a02e06862a6ff3c9c8a0c770441f1c59927
parent 6a72b27ae6d9fcc506d6aea8d126c16f8d86c533

Merge commit '6a72b27ae6d9fcc506d6aea8d126c16f8d86c533' into
OT_BETA_JAVA8

Conflicts:
	org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
	org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
	org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTest.java
	org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/StackMapAttributeTest.java
	org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SingleNameReference.java
	org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedTypeBinding.java