tree ecd298ef37fdad327a2e4573dc76d3f509941568
parent bdcc2f91f0a6688e6a47e86224e7170ae3e3dd25
parent 7dd12628356f88ca16aada59447ded2786592ddd
author matozoid <hexagonaal@gmail.com> 1468415171 +0200
committer matozoid <hexagonaal@gmail.com> 1468415171 +0200

Merge branch 'master' into issue-341

# Conflicts:
#	javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/body/MultiTypeParameter.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java