tree 8a349618da868a6da064d0a716c2fff731ca46ae
parent ff9aee52511188d4b6be0a7089e1b885d40e427e
parent 9232f9ca6ce7d0fc3db72693b5dbf8298d5c30f0
author Hervé Boutemy <hboutemy@apache.org> 1514591956 +0100
committer Hervé Boutemy <hboutemy@apache.org> 1514592768 +0100

Merge modifications done during partial git migration

Conflicts:
	src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java