Fake merge of release-notes fixes in buildbot-0.8.7

buildbot · Sep 3, 2012 · a8fadce · a8fadce
2 parents a35a7f4 + 069a55a
commit a8fadce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/master/docs/release-notes.rst b/master/docs/release-notes.rst
@@ -14,12 +14,6 @@ Master
 Features
 ~~~~~~~~
 
-* The :bb:chsrc:`SVNPoller` now supports multiple projects and codebases.
-  See :bb:pull:`443`.
-
-* The :bb:status:`MailNotifier` now takes a callable to calculate the "previous" build for purposes of determining status changes.
-  See :bb:pull:`489`.
-
 * The :bb:status:`IRC` bot now supports clean shutdown and immediate shutdown by using the command 'shutdown'.
   To allow the command to function, you must provide `allowShutdown=True`.
 

diff --git a/master/docs/release-notes/0.8.7.rst b/master/docs/release-notes/0.8.7.rst
@@ -58,6 +58,13 @@ Features
     id to use with Javascript. Explicit line-breaks have been removed from the HTML generator and
     are now controlled using CSS. 
 
+* The :bb:chsrc:`SVNPoller` now supports multiple projects and codebases.
+  See :bb:pull:`443`.
+
+* The :bb:status:`MailNotifier` now takes a callable to calculate the "previous" build for purposes of determining status changes.
+  See :bb:pull:`489`.
+
+
 Deprecations, Removals, and Non-Compatible Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~