~bzr-pqm/bzr/bzr.dev

Committer: Vincent Ladeuil
Date: 2010-01-23 11:37:40 UTC
mto: <a title="Merged In 4984.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/4984.1.1?remember=2425.1.1">(4984.1.1 integration)
mto: This revision was merged to the branch mainline in revision 4985 .
Revision ID: v.ladeuil+lp@free.fr-20100123113740-0a324t1w36zecx59

Wrong deprecation caught by pqm.

* bzrlib/log.py:
(_rebase_merge_depth): Don't deprecate, it's *still* used !

added added

removed removed