Noting security fixes in 2.3

changelog.html

@@ -77,8 +77,9 @@ Upcoming changes</a>
 </div><!--=TRUNK-END=-->
 <h3><a name=v2.3>What's new in 2.3</a> (2016/05/11)</h3>
 <ul class=image>
-  <li class=bug>
-    Security fixes
+  <li class="major bug">
+     <strong>Important security fixes</strong>
+     (<a href="https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2016-05-11">security advisory</a>)
 </ul>
 <h3><a name=v2.2>What's new in 2.2</a> (2016/05/08)</h3>
 <ul class=image>
@@ -116,7 +117,6 @@ Upcoming changes</a>
   <li class="rfe">
     Fix inline help for node name field.
   	(<a href="https://issues.jenkins-ci.org/browse/JENKINS-34601">issue 34601</a>)
->>>>>>> c83a8fdf0d048905928ba531d45527c1173f868d
 </ul>
 <h3><a name=v2.1>What's new in 2.1</a> (2016/05/01)</h3>
 <ul class=image>
@@ -280,7 +280,7 @@ Upcoming changes</a>
     Reduce log level of <tt>UncaughtExceptionHandler</tt> message on startup.
     (<a href="https://github.com/jenkinsci/jenkins/pull/2171">pull 2171</a>)
   <li class="rfe">
-    Make list of build causes immutable.
+    Don't store redundant build causes, make list of build causes immutable.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-33467">issue 33467</a>)
   <li class="rfe">
     Developer API: Add <tt>Fingerprint.getXStream()</tt>.