Merge lp:~xnox/bzr-pipeline/bump-bzr into lp:bzr-pipeline

[Dimitri John Ledkov]

[Aaron Bentley (abentley)]

If we're going to do a minimal-change update for 2.6 support, I think it should be in stable, which the releases are cut from, not trunk. This branch won't merge cleanly into stable (i.e. it brings in trunk changes), so I will just re-do it in stable.

review: Disapprove

Unmerged revisions

215. By Dimitri John Ledkov on 2013-09-11

Bump max version to 2.6

=== modified file '__init__.py'
--- __init__.py	2012-01-20 01:09:36 +0000
+++ __init__.py	2013-09-11 07:42:02 +0000
@@ -23,7 +23,7 @@
 version_info = (1, 4, 0)
 
 minimum_bzrlib_version = (2, 2)
-maximum_bzrlib_version = (2, 5)
+maximum_bzrlib_version = (2, 6)
 
 
 TOO_OLD = 'too_old'