/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_propose.py

  • Committer: Vincent Ladeuil
  • Date: 2011-12-02 12:35:10 UTC
  • mfrom: (6338 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6339.
  • Revision ID: v.ladeuil+lp@free.fr-20111202123510-2oyuj2jcfy414ldk
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_propose.py
25
25
from bzrlib import (
26
26
    msgeditor,
27
27
    )
 
28
from bzrlib.i18n import gettext
28
29
from bzrlib.plugins.launchpad import (
29
30
    lp_api,
30
31
    lp_registration,