merged back the RC branch

changelog.html

@@ -86,7 +86,10 @@ Upcoming changes</a>
 
 <!-- these changes are controlled by the release process. DO NOT MODIFY -->
 <div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.517>What's new in 1.517</a> <!--=DATE=--></h3>
+<h3><a name=v1.518>What's new in 1.518</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.517>What's new in 1.517</a> (2013/06/02)</h3>
 <ul class=image>
   <li class=rfe>
     Enable word breaking in potentially long strings like job names.
@@ -107,7 +110,6 @@ Upcoming changes</a>
     Using proper directory separator character for permalinks on Windows.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17681">issue 17681</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.516>What's new in 1.516</a> (2013/05/27)</h3>
 <ul class=image>
   <li class=bug>

debian/debian/changelog

+jenkins (1.517) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 02 Jun 2013 19:14:40 -0700
+
 jenkins (1.516) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.