~bzr-pqm/bzr/bzr.dev

Committer: Jelmer Vernooij
Date: 2011-12-20 15:39:20 UTC
mto: <a title="Merged In 6531.3.1" href="/~bzr-pqm/bzr/bzr.dev/revision/6531.3.1?remember=5452">(6531.3.1 merge-grep)
mto: This revision was merged to the branch mainline in revision 6555 .
Revision ID: jelmer@canonical.com-20111220153920-ua3amlyncnmu69tx

Fix compatibility with newer versions of bzr: don't use relative imports in lazy imports, and import features from bzrlib.tests.features.

added added

removed removed