Rev 1900: merge 0.4. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1900
revision-id: jelmer at samba.org-20080910174032-4r55at7zlew8ae84
parent: jelmer at samba.org-20080910161915-11n0289lg72ocwke
parent: jelmer at samba.org-20080910173951-4b341o1iilb95a94
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2008-09-10 19:40:32 +0200
message:
  merge 0.4.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1669.1.42
    revision-id: jelmer at samba.org-20080910173951-4b341o1iilb95a94
    parent: jelmer at samba.org-20080908214051-el0k75rw1uzv20ha
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-09-10 19:39:51 +0200
    message:
      Mark as compatible with bzr 1.7.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
=== modified file '__init__.py'
--- a/__init__.py	2008-09-09 19:16:54 +0000
+++ b/__init__.py	2008-09-10 17:40:32 +0000
@@ -54,7 +54,7 @@
     version_string = '%d.%d.%d%s%d' % version_info
 __version__ = version_string
 
-COMPATIBLE_BZR_VERSIONS = [(1, 6)]
+COMPATIBLE_BZR_VERSIONS = [(1, 6), (1, 7)]
 
 def check_bzrlib_version(desired):
     """Check that bzrlib is compatible.