Kohsuke Kawaguchi 039e43cf48 Merged ce27914ce9 ...

Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/model/AbstractProject.java
	core/src/main/java/hudson/model/Descriptor.java
	core/src/main/java/hudson/model/Hudson.java
	core/src/main/java/hudson/tasks/BuildTrigger.java
	core/src/main/resources/hudson/model/View/newJob.jelly
	core/src/main/resources/hudson/model/View/sidepanel.jelly
	core/src/main/resources/hudson/views/Messages_ja.properties
	maven-plugin/src/main/java/hudson/maven/MavenBuild.java
	maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
	maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java

2011-07-05 19:42:20 -07:00

..

src

Merged ce27914ce9

2011-07-05 19:42:20 -07:00

pom.xml

the trunk is toward 1.421-SNAPSHOT

2011-07-05 12:26:03 -07:00