merged back the RC branch

changelog.html

@@ -83,7 +83,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.547>What's new in 1.547</a> <!--=DATE=--></h3>
+<h3><a name=v1.548>What's new in 1.548</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.547>What's new in 1.547</a> (2014/01/12)</h3>
 <ul class=image>
   <li class="major bug">
     NPE since 1.545 when using aggregated test result publisher without specifying downstream jobs explicitly.
@@ -92,7 +95,6 @@ Upcoming changes</a>
     Fixed Trend Graph NPE when there isn't any builds
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21239">issue 21239</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.546>What's new in 1.546</a> (2014/01/06)</h3>
 <ul class=image>
   <li class="major bug">

debian/debian/changelog

+jenkins (1.547) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 12 Jan 2014 20:15:05 -0800
+
 jenkins (1.546) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.