Rev 4900: merge the 2.0.4 branch into 2.1.0b5 in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 4900 [merge]
revision-id: john at arbash-meinel.com-20091215195900-fvgxdv9ycbrnzp1o
parent: pqm at pqm.ubuntu.com-20091215160537-tjaqi73q1a1ayfps
parent: pqm at pqm.ubuntu.com-20091215185122-u7np9em9l26jvfgj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2009-12-15 13:59:00 -0600
message:
  merge the 2.0.4 branch into 2.1.0b5
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-12-15 06:53:38 +0000
+++ b/NEWS	2009-12-15 19:59:00 +0000
@@ -35,6 +35,36 @@
 Testing
 *******
 
+bzr 2.0.4 (not released yet)
+############################
+
+:Codename: template
+:2.0.4: ???
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
 
 bzr 2.1.0b4
 ###########