Rev 1762: Rename branches.conf to locations.conf in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1762
revision-id: pqm at pqm.ubuntu.com-20060617190945-49d8ba41828060f5
parent: pqm at pqm.ubuntu.com-20060617021848-38906188fc2a0300
parent: abentley at panoramicfeedback.com-20060617190145-c54d21563df3cf29
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-06-17 20:09:45 +0100
message:
  Rename branches.conf to locations.conf
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  doc/configuration.txt          configuration.txt-20060314161707-868350809502af01
  doc/setting_up_email.txt       setting_up_email.txt-20060314161707-fd242c8944346173
  doc/tutorial.txt               tutorial.txt-20050804190939-9dcbba2ef053bc84
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060617190145-c54d21563df3cf29
    parent: abentley at panoramicfeedback.com-20060617190115-81ab9bbc7aebcf8a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: config
    timestamp: Sat 2006-06-17 15:01:45 -0400
    message:
      Add credit to NEWS entry
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060617190115-81ab9bbc7aebcf8a
    parent: abentley at panoramicfeedback.com-20060616155924-893f31f8078a90df
    parent: pqm at pqm.ubuntu.com-20060617021848-38906188fc2a0300
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: config
    timestamp: Sat 2006-06-17 15:01:15 -0400
    message:
      Merge from dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060616155924-893f31f8078a90df
    parent: abentley at panoramicfeedback.com-20060614194557-6b499aa1cf03f7e6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: config
    timestamp: Fri 2006-06-16 11:59:24 -0400
    message:
      Rename branches.conf to locations.conf