Merge branch 'javadoc-format-refactor' of https://github.com/c2nes/intellij-community

author Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>

Wed, 24 May 2017 09:23:21 +0000 (12:23 +0300)

committer Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>

Wed, 24 May 2017 09:23:21 +0000 (12:23 +0300)
author Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Wed, 24 May 2017 09:23:21 +0000 (12:23 +0300)
committer Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Wed, 24 May 2017 09:23:21 +0000 (12:23 +0300)
diff --cc java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/JDParamListOwnerComment.java
Simple merge
diff --cc java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/JDTag.java
Simple merge
author	Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
	Wed, 24 May 2017 09:23:21 +0000 (12:23 +0300)
committer	Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
	Wed, 24 May 2017 09:23:21 +0000 (12:23 +0300)
		1	2
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/JDParamListOwnerComment.java	patch \|	diff1 \|	diff2 \|	blob \| history
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/JDTag.java	patch \|	diff1 \|	diff2 \|	blob \| history