Merge branch 'main' of https://github.com/hudson/hudson into main

Conflicts:
	.gitignore

.gitignore

 target
 work
+
 # IntelliJ project files 
 *.iml
 *.iws
 *.ipr
+
 # eclipse project file
 .settings
 .classpath
-.project
\ No newline at end of file
+.project
+
+war/images/16x16
+war/images/24x24
+war/images/32x32
+war/images/48x48
+hudson.war
+RPMS
+SRPMS
+debian/binary
+debian/debian/hudson
+debian/debian/hudson.substvars
+debian/debian/files
+debian/build-stamp
+debian/configure-stamp
+*.debhelper
+*.debhelper.log
+

changelog.html

@@ -39,6 +39,14 @@ Upcoming changes</a>
 
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
+<ul class=image>
+  <li class=>
+</ul>
+</div><!--=TRUNK-END=-->
+
+<!-- these changes are controlled by the release process. DO NOT MODIFY -->
+<div id="rc" style="display:none;"><!--=BEGIN=-->
+<h3><a name=v1.388>What's new in 1.388</a> <!--=DATE=--></h3>
 <ul class=image>
   <li class=bug>
     Failure to UDP broadcast shouldn't kill the Hudson bootup process.
@@ -63,12 +71,6 @@ Upcoming changes</a>
   <li class=rfe>
     Added "set-build-description" CLI command.
 </ul>
-</div><!--=TRUNK-END=-->
-
-<!-- these changes are controlled by the release process. DO NOT MODIFY -->
-<div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.388>What's new in 1.388</a> <!--=DATE=--></h3>
-<!--=RC-CHANGES=-->
 </div><!--=END=-->
 <h3><a name=v1.387>What's new in 1.387</a> (2010/11/27)</h3>
 <ul class=image>