~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 6202.

  • Committer: Patch Queue Manager
  • Date: 2011-10-06 18:00:14 UTC
  • mfrom: (6201.1.1 dev_2.4_integration)
  • Revision ID: pqm@pqm.ubuntu.com-20111006180014-3qge365pl5wxnsy9
(gz) Merge 2.4 into dev to resolve conflict in setup.py (Martin Packman)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: