Rev 2294: Merge bzr-svn 0.4.17. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2294
revision-id: jelmer at samba.org-20090112234255-t9z7rdv089kmdsvs
parent: jelmer at samba.org-20090112220132-nb8iq1zhelaso8ya
parent: jelmer at samba.org-20090112233520-wtvg85k0mgds6dk7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Tue 2009-01-13 00:42:55 +0100
message:
  Merge bzr-svn 0.4.17.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
    ------------------------------------------------------------
    revno: 1669.12.5
    tags: bzr-svn-0.4.17
    revision-id: jelmer at samba.org-20090112233520-wtvg85k0mgds6dk7
    parent: jelmer at samba.org-20081204150336-2f00myb4gewski80
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2009-01-13 00:35:20 +0100
    message:
      Release bzr-svn 0.4.17, compatible with bzr 1.11.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      setup.py                       setup.py-20060502115218-86950492da22353f
=== modified file 'NEWS'
--- a/NEWS	2009-01-11 13:54:35 +0000
+++ b/NEWS	2009-01-12 23:42:55 +0000
@@ -18,8 +18,6 @@
 
    * Fix handling of custom layouts, which used unicode internally. (#306629)
 
-   * Mark as compatible with Bazaar 1.11.
-
    * Fix pointless commits when using roundtripping using revision 
      properties. (#299943)
 
@@ -111,6 +109,12 @@
 
     + Standard commit code provides commit notification. (#79333)
 
+bzr-svn 0.4.17	2008-01-13
+
+  BUG FIXES
+
+   * Mark as compatible with Bazaar 1.11.
+
 bzr-svn 0.4.16	2008-12-06
 
   BUG FIXES